summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2008-12-09 17:57:59 +0000
committerPierre Joye <pajoye@php.net>2008-12-09 17:57:59 +0000
commita8578a5ab1bd78b553ca071aae95e25c441af24a (patch)
treea6dd2ed1979053fda7ea6117b86b9a84c1d3e1fc
parent9e5929522475ecd53824bcaa9fb31f439e7b292e (diff)
downloadphp-git-a8578a5ab1bd78b553ca071aae95e25c441af24a.tar.gz
- double declaration and comments cleanup
-rw-r--r--ext/standard/info.c9
-rwxr-xr-xext/standard/winver.h4
2 files changed, 0 insertions, 13 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c
index c2b8da8893..7eeae6f085 100644
--- 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 1bb6310bb3..cb469a91c0 100755
--- 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