This broke the NetWare build so I fixed it. I never saw the same problem in trunk so I'm not sure where this patch came from in the first place. I don't have a problem with redefining new, I just need it fixed so that NetWare will build before Sander tags the tree.
Brad >>> [EMAIL PROTECTED] Monday, April 11, 2005 1:35:26 PM >>> On Mon, Apr 11, 2005 at 03:47:03PM -0000, Brad Nicholes wrote: > Author: bnicholes > Date: Mon Apr 11 08:47:03 2005 > New Revision: 160909 > > URL: http://svn.apache.org/viewcvs?view=rev&rev=160909 > Log: > Fix a const/non-const conversion error when building with the strict > Metrowerks compiler What about the whole voting thing eh? This isn't platform-specific code. Looks like the correct fix is to have new be a const char ** array in the first place and remove both casts. > > Modified: > httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c > > Modified: httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c > URL: > http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c?view=diff&r1=160908&r2=160909 > > ============================================================================== > --- httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c (original) > +++ httpd/httpd/branches/2.0.x/modules/experimental/mod_cache.c Mon Apr 11 > 08:47:03 2005 > @@ -810,7 +810,7 @@ > * (When 'None' is passed, IGNORE_HEADERS_SET && nelts == 0.) > */ > new = (char **)apr_array_push(conf->ignore_headers); > - (*new) = header; > + (*new) = (char*)header; > } > } > conf->ignore_headers_set = CACHE_IGNORE_HEADERS_SET; >
