summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/rpc/com/com.c2
-rw-r--r--ext/rpc/com/conversion.c2
-rw-r--r--ext/rpc/com/dispatch.c2
-rw-r--r--ext/rpc/com/variant.c2
-rw-r--r--ext/snmp/winsnmp.c2
-rw-r--r--ext/standard/file.c2
-rw-r--r--ext/standard/flock_compat.c1
-rw-r--r--ext/standard/ftp_fopen_wrapper.c1
-rw-r--r--ext/standard/http_fopen_wrapper.c2
-rw-r--r--ext/standard/pack.c2
-rw-r--r--ext/standard/rand.c7
-rw-r--r--ext/w32api/w32api.c3
-rw-r--r--ext/zlib/zlib.c2
-rw-r--r--main/fopen_wrappers.c2
-rw-r--r--main/main.c3
-rw-r--r--main/network.c2
-rw-r--r--main/php.h4
-rw-r--r--main/php_open_temporary_file.c2
-rw-r--r--sapi/apache/php_apache_http.h1
-rw-r--r--sapi/cgi/cgi_main.c2
-rw-r--r--sapi/isapi/php4isapi.c21
21 files changed, 22 insertions, 45 deletions
diff --git a/ext/rpc/com/com.c b/ext/rpc/com/com.c
index e18a1c22de..e6d28f024b 100644
--- a/ext/rpc/com/com.c
+++ b/ext/rpc/com/com.c
@@ -19,6 +19,8 @@
#define _WIN32_DCOM
#define COBJMACROS
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include "../rpc.h"
#include "../handler.h"
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index fb61c0eeb1..acdd6cef40 100644
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -31,6 +31,8 @@
#ifdef PHP_WIN32
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include "php.h"
#include "../rpc.h"
diff --git a/ext/rpc/com/dispatch.c b/ext/rpc/com/dispatch.c
index f9e57da720..dab24d63f9 100644
--- a/ext/rpc/com/dispatch.c
+++ b/ext/rpc/com/dispatch.c
@@ -23,6 +23,8 @@
* them as objects implementing IDispatch.
* */
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include "../rpc.h"
#include "php.h"
diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index 6106271299..7810049b7a 100644
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -27,6 +27,8 @@
#ifdef PHP_WIN32
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c
index 96e3732a21..188d526ff5 100644
--- a/ext/snmp/winsnmp.c
+++ b/ext/snmp/winsnmp.c
@@ -10,8 +10,6 @@ Created from the snmputil sample in the Microsoft SDK for NT
#include "php_snmp.h"
#include <sys/types.h>
-#include <windows.h>
-
#include <stdio.h>
#include <string.h>
#include <malloc.h>
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 576504269c..d218d74ce6 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -43,8 +43,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#include "win32/winutil.h"
diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c
index ea9d518a29..776926e2f4 100644
--- a/ext/standard/flock_compat.c
+++ b/ext/standard/flock_compat.c
@@ -29,7 +29,6 @@
#endif
#ifdef PHP_WIN32
-#include <windows.h>
#include <io.h>
#endif
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index a603b464b3..8bcffec519 100644
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -31,7 +31,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index d12c61b5f5..6ce5c96d43 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -35,8 +35,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 755665d636..3b855f8f77 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -26,8 +26,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
diff --git a/ext/standard/rand.c b/ext/standard/rand.c
index e91853fa74..04f98b34f9 100644
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@ -24,13 +24,6 @@
#include <stdlib.h>
-#ifdef PHP_WIN32
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-# include <windows.h>
-#endif
-
#if defined(NETWARE) && !defined(NEW_LIBC) /* For getpid() used below */
#include "netware/pwd.h"
#endif
diff --git a/ext/w32api/w32api.c b/ext/w32api/w32api.c
index 7edd607a2e..6442f22c38 100644
--- a/ext/w32api/w32api.c
+++ b/ext/w32api/w32api.c
@@ -209,9 +209,6 @@
#include <stdio.h>
#include <stdlib.h>
-#define WINDOWS_LEAN_AND_MEAN
-#include <windows.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index b04ca107eb..280f45eaa3 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -35,8 +35,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#else
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index eb91436b3b..d1c9f57007 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -32,8 +32,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
diff --git a/main/main.c b/main/main.c
index 91d66dac8c..1cf0bf7eb6 100644
--- a/main/main.c
+++ b/main/main.c
@@ -22,6 +22,9 @@
/* {{{ includes
*/
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include <stdio.h>
#include "php.h"
#ifdef PHP_WIN32
diff --git a/main/network.c b/main/network.c
index 50428a8116..34b46f7a36 100644
--- a/main/network.c
+++ b/main/network.c
@@ -25,8 +25,6 @@
#include <stddef.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
diff --git a/main/php.h b/main/php.h
index d6c220b3e1..6cd191453a 100644
--- a/main/php.h
+++ b/main/php.h
@@ -22,10 +22,6 @@
#ifndef PHP_H
#define PHP_H
-#ifdef PHP_WIN32
-#include <winsock2.h>
-#endif
-
#ifdef HAVE_DMALLOC
#include <dmalloc.h>
#endif
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index f24ee66e31..acf804b2e4 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -26,8 +26,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#include "win32/winutil.h"
diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h
index f3909efb77..b6c4a959f6 100644
--- a/sapi/apache/php_apache_http.h
+++ b/sapi/apache/php_apache_http.h
@@ -1,7 +1,6 @@
#define NO_REGEX_EXTRA_H
#ifdef WIN32
-#include <winsock2.h>
#include <stddef.h>
#endif
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index a4a8dcbc5a..e540039ee4 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1572,7 +1572,7 @@ consult the installation file that came with this distribution, or visit \n\
sapi_shutdown();
#ifdef ZTS
- tsrm_shutdown();
+ /*tsrm_shutdown();*/
#endif
#if PHP_WIN32 && ZEND_DEBUG && 0
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 62f7b04a02..71090bcc5e 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -17,20 +17,10 @@
+----------------------------------------------------------------------+
*/
-#ifdef PHP_WIN32
-# include <winsock2.h>
-# include <windows.h>
-# include <process.h>
-#else
-# define __try
-# define __except(val)
-# define __declspec(foo)
-#endif
-
+#include "php.h"
#include <httpext.h>
#include <httpfilt.h>
#include <httpext.h>
-#include "php.h"
#include "php_main.h"
#include "SAPI.h"
#include "php_globals.h"
@@ -38,6 +28,15 @@
#include "php_variables.h"
#include "php_ini.h"
+#ifdef PHP_WIN32
+# include <process.h>
+#else
+# define __try
+# define __except(val)
+# define __declspec(foo)
+#endif
+
+
#ifdef WITH_ZEUS
# include "httpext.h"
# include <errno.h>
View Lorry Controller Status