luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't mess with WINVER 

not necessairy for current Windows versions
This commit is contained in:
h_vogt 2017-02-14 21:51:28 +01:00 committed by rlar
parent 78ea2e1523
commit 7c06cb2d12
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontend/com_sysinfo.c
View File

@ -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 <psapi.h>
#endif
#endif
#include "stdio.h"

9
src/frontend/resource.c
View File

@ -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 <windows.h>
/* 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 <psapi.h>
#endif
#endif /* HAVE_WIN32 */