- late MFB (sry): fix VC6 build

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 68a9bffb2d1d88cfdab873839668e865e426c53e..933e4d11607343b52761925326861b0fb00be8c8 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -38,6 +38,17 @@
 #include <sys/utsname.h>
 #endif
 
+
+#ifdef PHP_WIN32
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+# include "winver.h"
+
+# if _MSC_VER < 1300
+#  define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
+# endif
+#endif
+
 #if HAVE_MBSTRING
 #include "ext/mbstring/mbstring.h"
 ZEND_EXTERN_MODULE_GLOBALS(mbstring)
@@ -341,14 +352,6 @@ PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
 
 #ifdef PHP_WIN32
 /* {{{  */
-typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
-typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
-
-#include "winver.h"
-
-#if _MSC_VER < 1300
-#define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
-#endif
 
 char* php_get_windows_name()
 {

diff --git a/ext/standard/winver.h b/ext/standard/winver.h
index ae5026e7172af3e4924e0d647c7cc4fcfdc5a4f7..cb469a91c0d82859b4867016a0b29875f7421d8a 100755 (executable)
--- a/ext/standard/winver.h
+++ b/ext/standard/winver.h
@@ -57,8 +57,14 @@
 #define VER_SUITE_BLADE                     0x00000400
 #define VER_SUITE_EMBEDDED_RESTRICTED       0x00000800
 #define VER_SUITE_SECURITY_APPLIANCE        0x00001000
-#define VER_SUITE_STORAGE_SERVER            0x00002000
-#define VER_SUITE_COMPUTE_SERVER            0x00004000
+#endif
+
+#ifndef VER_SUITE_STORAGE_SERVER
+# define VER_SUITE_STORAGE_SERVER            0x00002000
+#endif
+
+#ifndef VER_SUITE_COMPUTE_SERVER
+# define VER_SUITE_COMPUTE_SERVER            0x00004000
 #endif
 
 #ifndef PROCESSOR_ARCHITECTURE_AMD64