diff options
| author | James Haley | 2010-01-26 00:59:02 +0000 |
|---|---|---|
| committer | James Haley | 2010-01-26 00:59:02 +0000 |
| commit | b80409202d07732ec201c9816887262b505b81d4 (patch) | |
| tree | 364dcb86f2c22411a720447bfa21c4de9191ff6f /src/i_main.c | |
| parent | 66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1 (diff) | |
| parent | 8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae (diff) | |
| download | chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.gz chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.bz2 chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.zip | |
Merge from raven-branch
Subversion-branch: /branches/strife-branch
Subversion-revision: 1825
Diffstat (limited to 'src/i_main.c')
| -rw-r--r-- | src/i_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/i_main.c b/src/i_main.c index a17d56b9..1ccc52c0 100644 --- a/src/i_main.c +++ b/src/i_main.c @@ -26,6 +26,8 @@ #include "config.h" +#include <stdio.h> + #include "SDL.h" #include "doomtype.h" @@ -53,7 +55,7 @@ static void LockCPUAffinity(void) #define WIN32_LEAN_AND_MEAN #include <windows.h> -typedef BOOL WINAPI (*SetAffinityFunc)(HANDLE hProcess, DWORD_PTR mask); +typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask); // This is a bit more complicated than it really needs to be. We really // just need to call the SetProcessAffinityMask function, but that @@ -79,7 +81,7 @@ static void LockCPUAffinity(void) } // Find the SetProcessAffinityMask function. - SetAffinity = GetProcAddress(kernel32_dll, "SetProcessAffinityMask"); + SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask"); // If the function was not found, we are on an old (Win9x) system // that doesn't have this function. That's no problem, because |