diff options
| author | Simon Howard | 2009-05-14 19:45:22 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-05-14 19:45:22 +0000 |
| commit | 664c35903202a2e7c56479eff1786e952718e4df (patch) | |
| tree | f8e0c53b9f27f6a7c72cdb228fb041bfe1278aaf /src/i_main.c | |
| parent | ebc8378619e9ddca26eb7cda1f4a4f2be1e98091 (diff) | |
| parent | 144849eee5804a0306d23f07a5be9877f242a1bf (diff) | |
| download | chocolate-doom-664c35903202a2e7c56479eff1786e952718e4df.tar.gz chocolate-doom-664c35903202a2e7c56479eff1786e952718e4df.tar.bz2 chocolate-doom-664c35903202a2e7c56479eff1786e952718e4df.zip | |
Merge from trunk. Note that src/i_sdlsound.c has not yet been merged as
it contains too many conflicts at present.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1522
Diffstat (limited to 'src/i_main.c')
| -rw-r--r-- | src/i_main.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/i_main.c b/src/i_main.c index a0b0bfd5..c1a9cb98 100644 --- a/src/i_main.c +++ b/src/i_main.c @@ -28,18 +28,6 @@ #include "SDL.h" -#include <signal.h> - -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif - -#ifdef HAVE_SCHED_SETAFFINITY -#include <unistd.h> -#include <sched.h> -#endif - #include "doomtype.h" #include "i_system.h" #include "m_argv.h" @@ -54,6 +42,9 @@ void D_DoomMain (void); #if defined(_WIN32) +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + typedef BOOL WINAPI (*SetAffinityFunc)(HANDLE hProcess, DWORD_PTR mask); // This is a bit more complicated than it really needs to be. We really @@ -98,16 +89,24 @@ static void LockCPUAffinity(void) #elif defined(HAVE_SCHED_SETAFFINITY) +#include <unistd.h> +#include <sched.h> + // Unix (Linux) version: static void LockCPUAffinity(void) { +#ifdef CPU_SET cpu_set_t set; CPU_ZERO(&set); CPU_SET(0, &set); sched_setaffinity(getpid(), sizeof(set), &set); +#else + unsigned long mask = 1; + sched_setaffinity(getpid(), sizeof(mask), &mask); +#endif } #else |