Fixup build for win32

diff --git a/main/network.c b/main/network.c
index 905af64813c1337d4f6811587b8eb46c75260681..1f9cdc30d551b0dcc5c62351cc91b4fdb9afc59a 100644 (file)
--- 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 dc8c5a942e87b0f77ea48398fff2559d7df5e05c..4f12e193ed3a4424330e38db9754f9177a28e082 100644 (file)
--- 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 01861701e86779a29009ac5c81885d20c0424628..802811d6ee4cf992ce5a308ec132b805fc0e5f7a 100644 (file)
--- 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 */

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index d3bdb9cf24ab5a06a81fa1fce782a3b631f3bcb3..1e44820673a743e218625e9bc16b654aa43a8d90 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -2202,6 +2202,38 @@ SOURCE=..\ext\xml\expat\xmltok_impl.h
 # Begin Group "Streams"\r
 \r
 # PROP Default_Filter ""\r
+# Begin Group "streams headers"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\php_stream_context.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\php_stream_filter_api.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\php_stream_mmap.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\php_stream_plain_wrapper.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\php_stream_transport.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\php_stream_userspace.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\php_streams_int.h\r
+# End Source File\r
+# End Group\r
 # Begin Source File\r
 \r
 SOURCE=..\main\streams\cast.c\r
@@ -2216,6 +2248,10 @@ SOURCE=..\main\streams\memory.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\main\streams\mmap.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\main\streams\plain_wrapper.c\r
 # End Source File\r
 # Begin Source File\r
@@ -2224,12 +2260,20 @@ SOURCE=..\main\streams\streams.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\main\streams\transports.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\standard\user_filters.c\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\main\streams\userspace.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\streams\xp_socket.c\r
+# End Source File\r
 # End Group\r
 # Begin Source File\r
 \r