shithub: choc

Info  •  Files  •  Log  •  Branches

Fixes for MSVC compile (thanks entryway).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1657

--- a/src/i_main.c

+++ b/src/i_main.c

@@ -47,7 +47,7 @@

 #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

@@ -74,7 +74,7 @@

     // 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

--- a/src/i_sdlsound.c

+++ b/src/i_sdlsound.c

@@ -275,12 +275,15 @@

 			     uint32_t *length,

 			     byte **data_ref)

 {

+    int lumplen;

+    byte *data;

+

     // Load the sound

     *lumpnum    = S_sfx[sound].lumpnum;

     *data_ref   = W_CacheLumpNum(*lumpnum, PU_STATIC);

-    int lumplen = W_LumpLength(*lumpnum);

-    byte *data  = *data_ref;

+    lumplen = W_LumpLength(*lumpnum);

+    data  = *data_ref;

     // Ensure this is a valid sound