wez Thu Feb 27 13:06:32 2003 EDT
Modified files:
/php4/main network.c
/php4/main/streams transports.c xp_socket.c
/php4/win32 php4dllts.dsp
Log:
Fixup build for win32
Index: php4/main/network.c
diff -u php4/main/network.c:1.91 php4/main/network.c:1.92
--- php4/main/network.c:1.91 Thu Feb 27 12:43:37 2003
+++ php4/main/network.c Thu Feb 27 13:06:30 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.91 2003/02/27 17:43:37 wez Exp $ */
+/* $Id: network.c,v 1.92 2003/02/27 18:06:30 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -93,6 +93,7 @@
#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 @@
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)) {
Index: php4/main/streams/transports.c
diff -u php4/main/streams/transports.c:1.1 php4/main/streams/transports.c:1.2
--- php4/main/streams/transports.c:1.1 Thu Feb 27 12:43:38 2003
+++ php4/main/streams/transports.c Thu Feb 27 13:06:30 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: transports.c,v 1.1 2003/02/27 17:43:38 wez Exp $ */
+/* $Id: transports.c,v 1.2 2003/02/27 18:06:30 wez Exp $ */
#include "php.h"
#include "php_streams_int.h"
@@ -78,6 +78,7 @@
case PHP_STREAM_PERSISTENT_FAILURE:
default:
/* failed; get a new one */
+ ;
}
}
Index: php4/main/streams/xp_socket.c
diff -u php4/main/streams/xp_socket.c:1.1 php4/main/streams/xp_socket.c:1.2
--- php4/main/streams/xp_socket.c:1.1 Thu Feb 27 12:43:38 2003
+++ php4/main/streams/xp_socket.c Thu Feb 27 13:06:30 2003
@@ -16,13 +16,17 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.1 2003/02/27 17:43:38 wez Exp $ */
+/* $Id: xp_socket.c,v 1.2 2003/02/27 18:06:30 wez Exp $ */
#include "php.h"
#include "ext/standard/file.h"
#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 @@
return PHP_STREAM_OPTION_RETURN_OK;
default:
/* fall through */
+ ;
}
/* fall through */
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.106 php4/win32/php4dllts.dsp:1.107
--- php4/win32/php4dllts.dsp:1.106 Fri Feb 21 09:06:55 2003
+++ php4/win32/php4dllts.dsp Thu Feb 27 13:06:31 2003
@@ -2202,6 +2202,38 @@
# 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 @@
# 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,11 +2260,19 @@
# 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
