httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_negotiation.c
Date Wed, 03 Oct 2001 13:10:16 GMT
trawick     01/10/03 06:10:16

  Modified:    modules/mappers mod_negotiation.c
  Log:
  rename variable "except" to avoid colliding with a macro of the
  same name on Tru64
  
  Revision  Changes    Path
  1.84      +4 -4      httpd-2.0/modules/mappers/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- mod_negotiation.c	2001/10/03 01:18:22	1.83
  +++ mod_negotiation.c	2001/10/03 13:10:16	1.84
  @@ -1108,7 +1108,7 @@
            */
           {
               int nexcept = exception_list->nelts;
  -            char **except = (char**)exception_list->elts;
  +            char **cur_except = (char**)exception_list->elts;
               char *segstart = filp, *segend, saveend;
   
               while (*segstart && nexcept) {
  @@ -1118,12 +1118,12 @@
                   *segend = '\0';
                       
   #ifdef CASE_BLIND_FILESYSTEM
  -                if (strcasecmp(segstart, *except) == 0) {
  +                if (strcasecmp(segstart, *cur_except) == 0) {
   #else
  -                if (strcmp(segstart, *except) == 0) {
  +                if (strcmp(segstart, *cur_except) == 0) {
   #endif
                       --nexcept;
  -                    ++except;                    
  +                    ++cur_except;                    
                   }         
                   
                   if (!saveend)
  
  
  

Mime
View raw message