diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2010-12-01 00:42:48 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2010-12-01 00:42:48 +0000 |
| commit | 283e7471e21410cc146efec1e3bd8b6bb1e1463c (patch) | |
| tree | d3f1067fdb2a3a8d3d8075ee8c5606fbaae34b95 /version_info.c | |
| parent | 7ba78f6857b31d1aead6192b79e10d6c19185a71 (diff) | |
Back out r35084 since it contains code fragments from MSDN, which are covered
under the "Microsoft Limited Public License" apparently.
svn path=/trunk/; revision=35085
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/version_info.c b/version_info.c index fe27476b83..32f99fca4e 100644 --- a/version_info.c +++ b/version_info.c @@ -190,8 +190,6 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) #if defined(_WIN32) OSVERSIONINFOEX info; SYSTEM_INFO system_info; - typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); - PGNSI pGNSI; #elif defined(HAVE_SYS_UTSNAME_H) struct utsname name; #endif @@ -231,14 +229,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) } memset(&system_info, '\0', sizeof system_info); - - /* Detect if the system we're *running on* supports the GetNativeSystemInfo() function (Windows XP/Server 2003 and higher), - * so we get the correct CPU architecture when running under "WOW64" x86 emulation on a 64-bit system. */ - pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetNativeSystemInfo"); - if(NULL != pGNSI) - pGNSI(&system_info); /* Call GetNativeSystemInfo() if found */ - else - GetSystemInfo(&system_info); /* Fallback to GetSystemInfo() - only for W2K or greater .... (which is what we support) */ + GetSystemInfo(&system_info); /* only for W2K or greater .... (which is what we support) */ switch (info.dwPlatformId) { |