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

found a way to compile w/o psapi under MS VC++ 6.0, prevent some warnings

This commit is contained in:
dwarning 2008-11-19 19:45:28 +00:00
parent 6c7f654e91
commit d5786196b6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/resource.c
View File

@ -24,7 +24,7 @@ $Id$
#include "variable.h" #include "variable.h"
#include "cktdefs.h" #include "cktdefs.h"
/* not apply top directory searcpath because config.h should not be used */ /* not apply top directory searchpath because config.h should not be used */
#ifdef _MSC_VER #ifdef _MSC_VER
#include "../misc/misc_time.h" /* timediff */ #include "../misc/misc_time.h" /* timediff */
#else #else
@ -48,7 +48,9 @@ $Id$
* Undefine _WIN32_WINNT 0x0500 if you want to compile under Windows ME * Undefine _WIN32_WINNT 0x0500 if you want to compile under Windows ME
* and older (not tested under Windows ME or 98!) * and older (not tested under Windows ME or 98!)
*/ */
#if (_MSC_VER > 1200) || defined(__MINGW32__) /* Exclude VC++ 6.0 from using the psapi */
#define _WIN32_WINNT 0x0500 #define _WIN32_WINNT 0x0500
#endif
/* /*
* The ngspice.h file included above defines BOOLEAN (via bool.h) and this * The ngspice.h file included above defines BOOLEAN (via bool.h) and this
* clashes with the definition obtained from windows.h (via winnt.h). * clashes with the definition obtained from windows.h (via winnt.h).
@ -295,15 +297,16 @@ printres(char *name)
} }
if (!name || eq(name, "space")) { if (!name || eq(name, "space")) {
unsigned long int usage = 0, limit = 0;
#ifdef ipsc #ifdef ipsc
unsigned long int usage = 0, limit = 0;
NXINFO cur = nxinfo, start = nxinfo_snap; NXINFO cur = nxinfo, start = nxinfo_snap;
usage = cur.dataend - cur.datastart; usage = cur.dataend - cur.datastart;
limit = start.availmem; limit = start.availmem;
#else /* ipsc */ #else /* ipsc */
# ifdef HAVE_GETRLIMIT # ifdef HAVE_GETRLIMIT
unsigned long int usage = 0, limit = 0;
struct rlimit rld; struct rlimit rld;
char *hi; char *hi;
@ -313,6 +316,7 @@ printres(char *name)
usage = (unsigned long int) (hi - enddata); usage = (unsigned long int) (hi - enddata);
# else /* HAVE_GETRLIMIT */ # else /* HAVE_GETRLIMIT */
# ifdef HAVE_ULIMIT # ifdef HAVE_ULIMIT
unsigned long int usage = 0, limit = 0;
char *hi; char *hi;
limit = ulimit(3, 0L) - (enddata - startdata); limit = ulimit(3, 0L) - (enddata - startdata);