From: Wez Furlong <wez@php.net>
Date: Thu, 27 Feb 2003 18:06:31 +0000 (+0000)
Subject: Fixup build for win32
X-Git-Tag: RELEASE_0_5~715
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=203068d055b3746074c9e7e85650a312d3c8b24d;p=php

Fixup build for win32
---

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