]> granicus.if.org Git - apache/commitdiff
rename variable "except" to avoid colliding with a macro of the
authorJeff Trawick <trawick@apache.org>
Wed, 3 Oct 2001 13:10:16 +0000 (13:10 +0000)
committerJeff Trawick <trawick@apache.org>
Wed, 3 Oct 2001 13:10:16 +0000 (13:10 +0000)
same name on Tru64

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91253 13f79535-47bb-0310-9956-ffa450edef68

modules/mappers/mod_negotiation.c

index cedb4efee4df9b58159f3497cb716d49c2c0c5c0..5223eca691c660ef714237271b94879ffc1153ac 100644 (file)
@@ -1108,7 +1108,7 @@ static int read_types_multi(negotiation_state *neg)
          */
         {
             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 @@ static int read_types_multi(negotiation_state *neg)
                 *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)