diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /main/network.c | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'main/network.c')
| -rw-r--r-- | main/network.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/main/network.c b/main/network.c index aedff7e207..f2143b1600 100644 --- a/main/network.c +++ b/main/network.c @@ -32,9 +32,6 @@ # include "win32/inet.h" # define O_RDONLY _O_RDONLY # include "win32/param.h" -#elif defined(NETWARE) -#include <sys/timeval.h> -#include <sys/param.h> #else #include <sys/param.h> #endif @@ -55,17 +52,8 @@ #include <sys/poll.h> #endif -#if defined(NETWARE) -#ifdef USE_WINSOCK -#include <novsock2.h> -#else -#include <arpa/inet.h> -#include <netinet/in.h> -#include <netdb.h> -#include <sys/select.h> -#include <sys/socket.h> -#endif -#elif !defined(PHP_WIN32) + +#ifndef PHP_WIN32 #include <netinet/in.h> #include <netdb.h> #if HAVE_ARPA_INET_H @@ -79,7 +67,7 @@ int inet_aton(const char *, struct in_addr *); #include "php_network.h" -#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif |