cvs: php4 /main network.c

hyanantha Mon Sep 9 07:23:12 2002 EDT Modified files: /php4/main network.c Log: NetWare related changes/modifications Index: php4/main/network.c diff -u php4/main/network.c:1.64 php4/main/network.c:1.65 --- php4/main/network.c:1.64 Sun Sep 8 18:26:11 2002 +++ php4/main/network.c Mon Sep 9 07:23:11 2002 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.64 2002/09/08 22:26:11 sesser Exp $ */ +/* $Id: network.c,v 1.65 2002/09/09 11:23:11 hyanantha Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ #define MAX_CHUNKS_PER_READ 10 @@ -31,6 +31,13 @@ #include <winsock.h> #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 @@ -51,7 +58,20 @@ #include <sys/poll.h> #endif -#ifndef PHP_WIN32 +#if defined(NETWARE) +#ifdef USE_WINSOCK +/*#include <ws2nlm.h>*/ +#include <novsock2.h> +#else +/* New headers for socket stuff */ +#ifdef NEW_LIBC +#include <netinet/in.h> +#include <netdb.h> +#include <sys/select.h> +#endif +#include <sys/socket.h> +#endif +#elif !defined(PHP_WIN32) #include <netinet/in.h> #include <netdb.h> #if HAVE_ARPA_INET_H @@ -65,7 +85,7 @@ #include "php_network.h" -#if defined(PHP_WIN32) || defined(__riscos__) +#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) #undef AF_UNIX #endif