diff options
| author | Wez Furlong <wez@php.net> | 2003-02-27 18:06:31 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-02-27 18:06:31 +0000 |
| commit | 203068d055b3746074c9e7e85650a312d3c8b24d (patch) | |
| tree | 21c8292cbaca2cbfee9ab3a515c3357aa21ce031 /main | |
| parent | fd61f69077f6156ca71dde60ecfd9ed9765a02db (diff) | |
| download | php-git-203068d055b3746074c9e7e85650a312d3c8b24d.tar.gz | |
Fixup build for win32
Diffstat (limited to 'main')
| -rw-r--r-- | main/network.c | 3 | ||||
| -rw-r--r-- | main/streams/transports.c | 1 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/main/network.c b/main/network.c index 905af64813..1f9cdc30d5 100644 --- a/main/network.c +++ b/main/network.c @@ -93,6 +93,7 @@ int inet_aton(const char *, struct in_addr *); #include "ext/standard/file.h" #ifdef PHP_WIN32 +# include "win32/time.h" # define SOCK_ERR INVALID_SOCKET # define SOCK_CONN_ERR SOCKET_ERROR # define PHP_TIMEOUT_ERROR_VALUE WSAETIMEDOUT @@ -336,7 +337,7 @@ PHPAPI int php_network_connect_socket(int sockfd, wset = rset; if ((n = select(sockfd + 1, &rset, &wset, &eset, timeout)) == 0) { - error = ETIMEDOUT; + error = PHP_TIMEOUT_ERROR_VALUE; } if(FD_ISSET(sockfd, &rset) || FD_ISSET(sockfd, &wset)) { diff --git a/main/streams/transports.c b/main/streams/transports.c index dc8c5a942e..4f12e193ed 100644 --- a/main/streams/transports.c +++ b/main/streams/transports.c @@ -78,6 +78,7 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, long namelen, int case PHP_STREAM_PERSISTENT_FAILURE: default: /* failed; get a new one */ + ; } } diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 01861701e8..802811d6ee 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -23,6 +23,10 @@ #include "streams/php_streams_int.h" #include "php_network.h" +#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) +# undef AF_UNIX +#endif + #if defined(AF_UNIX) #include <sys/un.h> #endif @@ -429,6 +433,7 @@ static int php_tcp_sockop_set_option(php_stream *stream, int option, int value, return PHP_STREAM_OPTION_RETURN_OK; default: /* fall through */ + ; } /* fall through */ |