cvs: php-src(PHP_5_3) /ext/standard info.c winver.h

pajoye Tue Dec 9 17:54:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c winver.h Log: - fix VC6 build http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.14&r2=1.249.2.10.2.14.2.15&diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.14 php-src/ext/standard/info.c:1.249.2.10.2.14.2.15 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.14 Mon Dec 8 07:32:14 2008 +++ php-src/ext/standard/info.c Tue Dec 9 17:54:01 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.14 2008/12/08 07:32:14 stas Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.15 2008/12/09 17:54:01 pajoye Exp $ */ #include "php.h" #include "php_ini.h" @@ -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 @@ 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) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/winver.h diff -u php-src/ext/standard/winver.h:1.1.2.1 php-src/ext/standard/winver.h:1.1.2.2 --- php-src/ext/standard/winver.h:1.1.2.1 Mon Dec 8 07:32:14 2008 +++ php-src/ext/standard/winver.h Tue Dec 9 17:54:01 2008 @@ -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