Commit 50b69c71 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

rename variable "except" to avoid colliding with a macro of the 

same name on Tru64


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

modules/mappers/mod_negotiation.c

+4 −4
Original line number Diff line number Diff line
@@ -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)