You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2005/03/15 14:49:19 UTC

svn commit: r157540 - httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Param/Param.xs

Author: joes
Date: Tue Mar 15 05:49:17 2005
New Revision: 157540

URL: http://svn.apache.org/viewcvs?view=rev&rev=157540
Log:
Just try to undef the bogus httpd.h strchr macro; 
nothing else tried so far seems to be portable.

Modified:
    httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Param/Param.xs

Modified: httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Param/Param.xs
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Param/Param.xs?view=diff&r1=157539&r2=157540
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Param/Param.xs (original)
+++ httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Param/Param.xs Tue Mar 15 05:49:17 2005
@@ -1,8 +1,9 @@
 #include "apreq_xs_tables.h"
 #define TABLE_CLASS "APR::Request::Param::Table"
 
-#ifndef index
-#define index strchr
+#ifdef AP_DEBUG
+/* Undo httpd.h's strchr override. */
+#undef strchr
 #endif
 
 static int apreq_xs_table_do_sub(void *data, const char *key,
@@ -670,7 +671,7 @@
     if (ct == NULL)
         Perl_croak(aTHX_ "$param->upload_type: can't find Content-Type header");
     
-    if ((sc = index(ct, ';')))
+    if ((sc = strchr(ct, ';')))
         len = sc - ct;
     else
         len = strlen(ct);