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/file.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/file.c')
| -rw-r--r-- | ext/standard/file.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index c75d2d3fa0..f5f489d43f 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -57,13 +57,9 @@ # if HAVE_SYS_SELECT_H # include <sys/select.h> # endif -# if defined(NETWARE) && defined(USE_WINSOCK) -# include <novsock2.h> -# else -# include <sys/socket.h> -# include <netinet/in.h> -# include <netdb.h> -# endif +# include <sys/socket.h> +# include <netinet/in.h> +# include <netdb.h> # if HAVE_ARPA_INET_H # include <arpa/inet.h> # endif @@ -2293,7 +2289,7 @@ out: } /* }}} */ -#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) /* {{{ proto string realpath(string path) Return the resolved path */ PHP_FUNCTION(realpath) |