- double declaration and comments cleanup

diff --git a/ext/standard/info.c b/ext/standard/info.c
index c2b8da88932c6c36b12cab3ae592bc44268b7970..7eeae6f085db6e8d581352228e9ecf16ad7980ec 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -252,15 +252,6 @@ PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
 
 #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;

diff --git a/ext/standard/winver.h b/ext/standard/winver.h
index 1bb6310bb30e4e4e40651ea09f2096838a0ccc68..cb469a91c0d82859b4867016a0b29875f7421d8a 100755 (executable)
--- a/ext/standard/winver.h
+++ b/ext/standard/winver.h
@@ -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