Re: cvs: php-src /main php_network.h

Should this have fixed the snapshot build too (of Apache2 module) ?? (just asking as it seems still be failing..) --Jani On Thu, 18 Dec 2003, Wez Furlong wrote: >wez Thu Dec 18 06:26:01 2003 EDT > > Modified files: > /php-src/main php_network.h > Log: > Counteract brain-death in Apache headers > (they #define strtoul to something that will break compilation, > and it successfully breaks the win32 IPv6 headers) > >Index: php-src/main/php_network.h >diff -u php-src/main/php_network.h:1.49 php-src/main/php_network.h:1.50 >--- php-src/main/php_network.h:1.49 Sat Dec 6 05:32:35 2003 >+++ php-src/main/php_network.h Thu Dec 18 06:26:00 2003 >@@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > >-/* $Id: php_network.h,v 1.49 2003/12/06 10:32:35 wez Exp $ */ >+/* $Id: php_network.h,v 1.50 2003/12/18 11:26:00 wez Exp $ */ > > #ifndef _PHP_NETWORK_H > #define _PHP_NETWORK_H >@@ -27,6 +27,9 @@ > # endif > # undef FD_SETSIZE > # include "arpa/inet.h" >+ /* Apache folks decided that strtoul was evil and redefined >+ * it to something that breaks the windows headers */ >+# undef strtoul > /* defines socklen_t and some IPV6 stuff */ > # include <ws2tcpip.h> > # if HAVE_WSPIAPI_H > >