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 /ext/standard/ftp_fopen_wrapper.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 'ext/standard/ftp_fopen_wrapper.c')
-rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index a5e00a6df9..5e156c5cf4 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -49,8 +49,6 @@ #ifdef PHP_WIN32 #include <winsock2.h> -#elif defined(NETWARE) && defined(USE_WINSOCK) -#include <novsock2.h> #else #include <netinet/in.h> #include <netdb.h> @@ -59,7 +57,7 @@ #endif #endif -#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif |