aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix __num_cores() definition on Windows to not cause unresolved symbols

Browse Source
This commit is contained in:
Matt Pharr
2011-09-29 13:35:50 -07:00
parent 32a0a30cf5
commit 9ed07ff2b5
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
builtins-c.c
View File

@@ -51,9 +51,7 @@
*/ */
#ifdef _MSC_VER #ifndef _MSC_VER
#include <windows.h>
#else
#include <unistd.h> #include <unistd.h>
#endif // !_MSC_VER #endif // !_MSC_VER
@@ -149,7 +147,21 @@ void __do_print(const char *format, const char *types, int width, int mask,
int __num_cores() { int __num_cores() {
#ifdef _MSC_VER #ifdef _MSC_VER
SYSTEM_INFO sysInfo; // This is quite a hack. Including all of windows.h to get this definition
// pulls in a bunch of stuff that leads to undefined symbols at link time.
// So we don't #include <windows.h> but instead have the equivalent declarations
// here. Presumably this struct declaration won't be changing in the future
// anyway...
struct SYSTEM_INFO {
int pad0[2];
void *pad1[2];
int *pad2;
int dwNumberOfProcessors;
int pad3[3];
};
struct SYSTEM_INFO sysInfo;
extern void __stdcall GetSystemInfo(struct SYSTEM_INFO *);
GetSystemInfo(&sysInfo); GetSystemInfo(&sysInfo);
return sysInfo.dwNumberOfProcessors; return sysInfo.dwNumberOfProcessors;
#else #else