Win32 build improvements

diff --git a/ext/rpc/com/com.c b/ext/rpc/com/com.c
index e18a1c22de7987658d12b474c44e64438f6acedb..e6d28f024bba912aefed914811e1d999ae9a00a1 100644 (file)
--- 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 fb61c0eeb135abae73e2aae9ac581cc7b6d6bb4a..acdd6cef40cd84df5197f25ffe8ad0416e914a3b 100644 (file)
--- 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 f9e57da720ac62ed6e4573eefc140612f3537449..dab24d63f938666bfca7bcf1c712bd3d7c3fba0a 100644 (file)
--- 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 61062712996abfae1d1e3f10f19fdaad1ac843f0..7810049b7a875eb8a5088730db7ff20f0b3dbc8c 100644 (file)
--- 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 96e3732a214f6957cdfaedb03b2e39f5a81d979d..188d526ff529e3723f0ae2004a7bd262ef1570e1 100644 (file)
--- 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 576504269cb648dfd1946058022a5e8a017485b0..d218d74ce6845f3a21fef42e4dae30a90f1154ca 100644 (file)
--- 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 ea9d518a298e307ae600a4f6de9d276ded5346ab..776926e2f4b3b41797c245457cd9217d870dd219 100644 (file)
--- 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 a603b464b3309533e0f7fc7fe0311bb0b7bbc981..8bcffec5198b8021ce35b601cd2af486d465ed52 100644 (file)
--- 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 d12c61b5f5f6dbc6ac70d5744a6db61c38196a2d..6ce5c96d4356f92d8292aae818afdcf56ddcedfa 100644 (file)
--- 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 755665d636035fef5fa9af6273eff1cf753f1e6e..3b855f8f77c486b4672aef11ebd1f963e528eb87 100644 (file)
--- 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 e91853fa74223e74e6db5fce577db489f7d8c935..04f98b34f93e94b4e7d82b4c92f8e0f33be3d26c 100644 (file)
--- 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 7edd607a2e694f8476f4b3f23a606e8b86426f16..6442f22c3837c7f7787946a09dbfd1ede98ce032 100644 (file)
--- 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 b04ca107ebf4dc83a3fefaee281d322fb3ec2c65..280f45eaa3637715702be93bc367fdcf0a77cf5a 100644 (file)
--- 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 eb91436b3bcc84be719d04fc55199787f8df2eec..d1c9f570070e732bdbf1b9ee928308d84027f697 100644 (file)
--- 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 91d66dac8c1af284a9c151c98c84570f6637093a..1cf0bf7eb616e70ee8fed2a68afcc9834afd7695 100644 (file)
--- 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 50428a8116618cd85ed0508a945f7a414a4ac228..34b46f7a36f880bd008ac05091ee3a4be6b8f27a 100644 (file)
--- 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 d6c220b3e143750859788b284d5f0fc41749f928..6cd191453a4d994d7f1f5b1e8ea857fd5bed9392 100644 (file)
--- 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 f24ee66e319689071282763030d2f90199e12c19..acf804b2e40726efa85331b978a296a4c25f250a 100644 (file)
--- 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 f3909efb772a96632fdc3382943f6fde56415d3d..b6c4a959f6dff404df33e031ecf0eb83a9af0235 100644 (file)
--- 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 a4a8dcbc5a9a9bb3e91b9eb55561f46602eb7350..e540039ee438a22345063c121f98cc3591e6cf1a 100644 (file)
--- 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 62f7b04a021bf039dd20cf7b8c5720d7d809acf8..71090bcc5e0ae5ae440d431cd41895ad9eed4523 100644 (file)
--- 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>