Improve Win32 build performance

diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index 1e71730c9a8a931ab09be094e110948a41d6ae1e..a176cebbacfe42f5194f8ae82371005e9aa3b735 100644 (file)
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -31,7 +31,13 @@
 #include <crtdbg.h>
 
 #include <string.h>
+
+#ifndef ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <winsock2.h>
 #include <windows.h>
+
 #include <float.h>
 
 typedef unsigned long ulong;

diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index d8321ab499394564310f623b77b3b7ca4060c8a7..0f9e4d7ba49f83ee53af1475e92832f54a656d45 100644 (file)
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -27,13 +27,6 @@
 #include "zend_ini_scanner.h"
 #include "zend_extensions.h"
 
-
-#if WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winbase.h>
-#endif
-
 #define YYSTYPE zval
 
 #ifdef ZTS