pajoye Fri Dec 12 10:33:05 2008 UTC Modified files: /php-src/ext/standard info.c winver.h Log: - late MFB (sry): fix VC6 build http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.295&r2=1.296&diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.295 php-src/ext/standard/info.c:1.296 --- php-src/ext/standard/info.c:1.295 Mon Dec 8 07:33:41 2008 +++ php-src/ext/standard/info.c Fri Dec 12 10:33:05 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.295 2008/12/08 07:33:41 stas Exp $ */ +/* $Id: info.c,v 1.296 2008/12/12 10:33:05 pajoye Exp $ */ #include "php.h" #include "php_ini.h" @@ -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 @@ #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() { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/winver.h diff -u php-src/ext/standard/winver.h:1.2 php-src/ext/standard/winver.h:1.3 --- php-src/ext/standard/winver.h:1.2 Mon Dec 8 07:33:41 2008 +++ php-src/ext/standard/winver.h Fri Dec 12 10:33:05 2008 @@ -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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php