- fix VC6 build

diff --git a/ext/standard/info.c b/ext/standard/info.c
index dd64c312ca2615e615312734a8eb2fc8d6f8f647..c2b8da88932c6c36b12cab3ae592bc44268b7970 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -38,6 +38,18 @@
 #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)
@@ -343,9 +355,9 @@ char* php_get_windows_name()
                if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2 )     {
                        if (GetSystemMetrics(SM_SERVERR2))
                                major = "Windows Server 2003 R2";
-                       else if (osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER)
+                       else if (osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER)
                                major = "Windows Storage Server 2003";
-                       else if (osvi.wSuiteMask==VER_SUITE_WH_SERVER)
+                       else if (osvi.wSuiteMask == VER_SUITE_WH_SERVER)
                                major = "Windows Home Server";
                        else if (osvi.wProductType == VER_NT_WORKSTATION &&
                                si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64) {

diff --git a/ext/standard/winver.h b/ext/standard/winver.h
index ae5026e7172af3e4924e0d647c7cc4fcfdc5a4f7..1bb6310bb30e4e4e40651ea09f2096838a0ccc68 100755 (executable)
--- a/ext/standard/winver.h
+++ b/ext/standard/winver.h
@@ -57,10 +57,20 @@
 #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
+/*
+ext\standard\info.c(346) : error C2065: 'VER_SUITE_STORAGE_SERVER' : undeclared identifier
+ext\standard\info.c(373) : error C2065: 'VER_SUITE_COMPUTE_SERVER' : undeclared identifier
+*/
+
 #ifndef PROCESSOR_ARCHITECTURE_AMD64
 #define PROCESSOR_ARCHITECTURE_AMD64            9
 #endif