From 7c06cb2d12c6fcf0d5977214a3cdc00f9c6829b6 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Tue, 14 Feb 2017 21:51:28 +0100 Subject: [PATCH] don't mess with WINVER not necessairy for current Windows versions --- src/frontend/com_sysinfo.c | 7 +------ src/frontend/resource.c | 9 --------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c index e8af139bf..4b8879ebf 100644 --- a/src/frontend/com_sysinfo.c +++ b/src/frontend/com_sysinfo.c @@ -21,15 +21,10 @@ #define WIN32_LEAN_AND_MEAN -#ifdef __MINGW32__ /* access to GlobalMemoryStatusEx in winbase.h:1558 */ -#define WINVER 0x0500 -#endif - #undef BOOLEAN #include "windows.h" -#if defined(__MINGW32__) || (_MSC_VER > 1200) /* Exclude VC++ 6.0 from using the psapi */ #include -#endif + #endif #include "stdio.h" diff --git a/src/frontend/resource.c b/src/frontend/resource.c index f84db2135..2353da7c5 100644 --- a/src/frontend/resource.c +++ b/src/frontend/resource.c @@ -41,9 +41,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #define WIN32_LEAN_AND_MEAN -#ifdef __MINGW32__ /* access to GlobalMemoryStatusEx in winbase.h:1558 */ -#define WINVER 0x0500 -#endif /* * The ngspice.h file included above defines BOOLEAN (via bool.h) and this * clashes with the definition obtained from windows.h (via winnt.h). @@ -53,13 +50,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group */ #undef BOOLEAN #include -/* At least Windows 2000 is needed - * Undefine _WIN32_WINNT 0x0500 if you want to compile under Windows ME - * and older (not tested under Windows ME or 98!) - */ -#if defined(__MINGW32__) || (_MSC_VER > 1200) /* Exclude VC++ 6.0 from using the psapi */ #include -#endif #endif /* HAVE_WIN32 */