pajoye                                   Fri, 19 Aug 2011 11:35:37 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315191

Log:
- undefine CALLBACK (btw, generic names like that should be avoided, w/o prefix 
:)

Changed paths:
    U   php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c
    U   php/php-src/trunk/sapi/cli/php_http_parser.c

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c     2011-08-19 
11:33:59 UTC (rev 315190)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c     2011-08-19 
11:35:37 UTC (rev 315191)
@@ -55,7 +55,9 @@
   }                                                                  \
 } while (0)

-
+#ifdef PHP_WIN32
+# undef CALLBACK
+#endif
 #define CALLBACK(FOR)                                                \
 do {                                                                 \
   CALLBACK_NOCLEAR(FOR);                                             \

Modified: php/php-src/trunk/sapi/cli/php_http_parser.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_http_parser.c        2011-08-19 11:33:59 UTC 
(rev 315190)
+++ php/php-src/trunk/sapi/cli/php_http_parser.c        2011-08-19 11:35:37 UTC 
(rev 315191)
@@ -55,7 +55,9 @@
   }                                                                  \
 } while (0)

-
+#ifdef PHP_WIN32
+# undef CALLBACK
+#endif
 #define CALLBACK(FOR)                                                \
 do {                                                                 \
   CALLBACK_NOCLEAR(FOR);                                             \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to