diff options
| author | Pierre Joye <pajoye@php.net> | 2008-12-09 17:54:01 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-12-09 17:54:01 +0000 |
| commit | 9e5929522475ecd53824bcaa9fb31f439e7b292e (patch) | |
| tree | 1d736a9f3a3b51b20b99af519e008581b4b695e8 /ext/standard | |
| parent | 780ff63c377dc79de2c04d6b341913ab0102135b (diff) | |
| download | php-git-9e5929522475ecd53824bcaa9fb31f439e7b292e.tar.gz | |
- fix VC6 build
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/info.c | 16 | ||||
| -rwxr-xr-x | ext/standard/winver.h | 14 |
2 files changed, 26 insertions, 4 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c index dd64c312ca..c2b8da8893 100644 --- 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 ae5026e717..1bb6310bb3 100755 --- 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 |