hyanantha Wed Oct 6 09:22:27 2004 EDT Modified files: /php-src/main network.c Log: removed unwanted NEW_LIBC checks http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.113&r2=1.114&ty=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.113 php-src/main/network.c:1.114 --- php-src/main/network.c:1.113 Fri Sep 17 10:36:54 2004 +++ php-src/main/network.c Wed Oct 6 09:22:21 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.113 2004/09/17 14:36:54 wez Exp $ */ +/* $Id: network.c,v 1.114 2004/10/06 13:22:21 hyanantha Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -29,13 +29,9 @@ #define O_RDONLY _O_RDONLY #include "win32/param.h" #elif defined(NETWARE) -#ifdef NEW_LIBC #include <sys/timeval.h> #include <sys/param.h> #else -#include "netware/time_nw.h" -#endif -#else #include <sys/param.h> #endif @@ -57,15 +53,12 @@ #if defined(NETWARE) #ifdef USE_WINSOCK -/*#include <ws2nlm.h>*/ #include <novsock2.h> #else -/* New headers for socket stuff */ -#ifdef NEW_LIBC +#include <arpa/inet.h> #include <netinet/in.h> #include <netdb.h> #include <sys/select.h> -#endif #include <sys/socket.h> #endif #elif !defined(PHP_WIN32)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php