Make Win32 happy with the recent changes.

9 files changed, 26 insertions, 15 deletions

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index cb953fc9bd..3c1f05b202 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include "php3_string.h"
 #include "safe_mode.h"
-#include "head.h"
+#include "functions/head.h"
 #include "exec.h"
 #include "php_globals.h"
 
diff --git a/ext/standard/file.c b/ext/standard/file.c
index cedb4b5109..5fdefec901 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -49,7 +49,7 @@
 #include <sys/socket.h>
 /* #include <sys/uio.h> */
 #endif
-#include "head.h"
+#include "functions/head.h"
 #include "safe_mode.h"
 #include "php3_string.h"
 #include "file.h"
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index d6e3f3326f..03e23b9526 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -34,7 +34,7 @@
 #include "tls.h"
 #endif
 #include "php.h"
-#include "head.h"
+#include "functions/head.h"
 #include "php3_string.h"
 #include "zend_execute.h"
 #include <stdio.h>
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index e1f7f3f177..b664f03afb 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -60,7 +60,7 @@
 
 #include "base64.h"
 #include "file.h"
-#include "post.h"
+#include "functions/post.h"
 #include "url.h"
 #include "fsock.h"
 
@@ -96,8 +96,8 @@ struct php3i_sockbuf {
 static struct php3i_sockbuf *phpsockbuf;
 
 static int php3_minit_fsock(INIT_FUNC_ARGS);
-static int php3_mshutdown_fsock(void);
-static int php3_rshutdown_fsock(void);
+static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS);
+static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS);
 
 php3_module_entry fsock_module_entry = {
 	"Socket functions", fsock_functions, php3_minit_fsock, php3_mshutdown_fsock, NULL, php3_rshutdown_fsock, NULL, STANDARD_MODULE_PROPERTIES
@@ -363,7 +363,8 @@ int _php3_sock_fgets(char *buf, int maxlen, int socket)
 			sockbuf->next = phpsockbuf;
 			phpsockbuf = sockbuf;
 		} else {
-			int needlen = sockbuf->writepos + buflen;
+			uint needlen = sockbuf->writepos + buflen;
+
 			if (needlen > sockbuf->readbuflen) {
 				sockbuf->readbuflen += maxlen;
 				sockbuf->readbuf = erealloc(sockbuf->readbuf, sockbuf->readbuflen);
@@ -440,7 +441,7 @@ static int php3_minit_fsock(INIT_FUNC_ARGS)
 /* }}} */
 	/* {{{ php3_mshutdown_fsock */
 
-static int php3_mshutdown_fsock(void)
+static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS)
 {
 #ifndef THREAD_SAFE
 	_php3_hash_destroy(&ht_socks);
@@ -451,7 +452,7 @@ static int php3_mshutdown_fsock(void)
 /* }}} */
     /* {{{ php3_rshutdown_fsock() */
 
-static int php3_rshutdown_fsock(void)
+static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS)
 {
 	struct php3i_sockbuf *sockbuf = phpsockbuf, *this;
 
diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index 9be93a34a6..f58da7fdeb 100644
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -32,7 +32,17 @@
 #ifndef _FSOCK_H
 #define _FSOCK_H
 
+#if WIN32|WINNT
+#	ifndef WINNT
+#	define WINNT 1
+#	endif
+#undef FD_SETSIZE
+#include "arpa/inet.h"
+#endif
+
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
 extern php3_module_entry fsock_module_entry;
 #define fsock_module_ptr &fsock_module_entry
diff --git a/ext/standard/info.c b/ext/standard/info.c
index a89460747e..8eaf6aa28e 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -33,7 +33,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
-#include "head.h"
+#include "functions/head.h"
 #include "info.h"
 #ifndef MSVC5
 #include "build-defs.h"
@@ -108,7 +108,7 @@ void _php3_info(void)
 
 
 	PUTS("<img src=\"");
-	PUTS(GLOBAL(php3_rqst)->uri);
+	/*PUTS(GLOBAL(php3_rqst)->uri);*/
 	PUTS("?=PHPE9568F34-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"56\" align=\"right\">\n");
 	php3_printf("<center><h1>PHP Version %s</h1></center>\n", PHP_VERSION);
 	PUTS("<p>by <a href=\"mailto:rasmus@lerdorf.on.ca\">Rasmus Lerdorf</a>,\n");
@@ -387,7 +387,7 @@ void _php3_info(void)
 	PUTS("<table width=\"100%%\"><tr>\n");
 	php3_printf("<td><h2>Zend</h2>This program makes use of the Zend scripting language engine:<br><pre>%s</pre></td>", get_zend_version());
 	PUTS("<td width=\"100\"><a href=\"http://www.zend.com/\"><img src=\"");
-	PUTS(GLOBAL(php3_rqst)->uri);
+	/*PUTS(GLOBAL(php3_rqst)->uri);*/
 	PUTS("?=PHPE9568F35-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"89\"></a></td>\n");
 	PUTS("</tr></table>\n");
 
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 629595df90..c1be66847c 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -46,7 +46,7 @@
 #else
 #include <sys/param.h>
 #endif
-#include "head.h"
+#include "functions/head.h"
 #include "safe_mode.h"
 #include "php3_string.h"
 #include "pack.h"
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 8700bb3f4a..7f56d03a22 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include "php.h"
 #include "reg.h"
-#include "post.h"
+#include "functions/post.h"
 #include "php3_string.h"
 #if HAVE_SETLOCALE
 #include <locale.h>
diff --git a/ext/standard/var.c b/ext/standard/var.c
index feb277c4c3..a602ee0eb7 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -36,7 +36,7 @@
 #include "php.h"
 #include "fopen-wrappers.h"
 #include "reg.h"
-#include "post.h"
+#include "functions/post.h"
 #include "php3_string.h"
 #if HAVE_SETLOCALE
 #include <locale.h>