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/ftp/ftp.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/ftp/ftp.c')
| -rw-r--r-- | ext/ftp/ftp.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 7b31a37a0b..456820f48e 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -38,15 +38,6 @@ #include <time.h> #ifdef PHP_WIN32 #include <winsock2.h> -#elif defined(NETWARE) -#ifdef USE_WINSOCK /* Modified to use Winsock (NOVSOCK2.H), at least for now */ -#include <novsock2.h> -#else -#include <sys/socket.h> -#include <netinet/in.h> -#include <netdb.h> -#endif -#else #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -72,11 +63,6 @@ #include "ftp.h" #include "ext/standard/fsock.h" -/* Additional headers for NetWare */ -#if defined(NETWARE) && !defined(USE_WINSOCK) -#include <sys/select.h> -#endif - /* sends an ftp command, returns true on success, false on error. * it sends the string "cmd args\r\n" if args is non-null, or * "cmd\r\n" if args is null @@ -1283,7 +1269,7 @@ my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) if (n == 0) { _set_errno(ETIMEDOUT); } -#elif !(defined(NETWARE) && defined(USE_WINSOCK)) +#else if (n == 0) { errno = ETIMEDOUT; } @@ -1372,7 +1358,7 @@ my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) if (n == 0) { _set_errno(ETIMEDOUT); } -#elif !(defined(NETWARE) && defined(USE_WINSOCK)) +#else if (n == 0) { errno = ETIMEDOUT; } @@ -1447,7 +1433,7 @@ data_available(ftpbuf_t *ftp, php_socket_t s) if (n == 0) { _set_errno(ETIMEDOUT); } -#elif !(defined(NETWARE) && defined(USE_WINSOCK)) +#else if (n == 0) { errno = ETIMEDOUT; } @@ -1471,7 +1457,7 @@ data_writeable(ftpbuf_t *ftp, php_socket_t s) if (n == 0) { _set_errno(ETIMEDOUT); } -#elif !(defined(NETWARE) && defined(USE_WINSOCK)) +#else if (n == 0) { errno = ETIMEDOUT; } @@ -1496,7 +1482,7 @@ my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *addrl if (n == 0) { _set_errno(ETIMEDOUT); } -#elif !(defined(NETWARE) && defined(USE_WINSOCK)) +#else if (n == 0) { errno = ETIMEDOUT; } |