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

pajoye Tue Dec 9 17:58:00 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard info.c winver.h Log: - double declaration and comments cleanup http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.15&r2=1.249.2.10.2.14.2.16&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.15 php-src/ext/standard/info.c:1.249.2.10.2.14.2.16 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.15 Tue Dec 9 17:54:01 2008 +++ php-src/ext/standard/info.c Tue Dec 9 17:57:59 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.15 2008/12/09 17:54:01 pajoye Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.16 2008/12/09 17:57:59 pajoye Exp $ */ #include "php.h" #include "php_ini.h" @@ -252,15 +252,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() { OSVERSIONINFOEX osvi; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/winver.h diff -u php-src/ext/standard/winver.h:1.1.2.2 php-src/ext/standard/winver.h:1.1.2.3 --- php-src/ext/standard/winver.h:1.1.2.2 Tue Dec 9 17:54:01 2008 +++ php-src/ext/standard/winver.h Tue Dec 9 17:57:59 2008 @@ -66,10 +66,6 @@ #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