another WIN32_LEAN_AND_MEAN patch from Willis, this one for non-SDL client and dedica...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6168 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cd_win.c b/cd_win.c
index 41f2a3caefd29522aa7b7db8769f2ecc3ce511dd..5b475496260eb5a1215c1e2079fe60c61a8bb601 100644 (file)
--- a/cd_win.c
+++ b/cd_win.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // rights reserved.
 
 #include <windows.h>
+#include <mmsystem.h>
 
 #include "quakedef.h"
 #include "cdaudio.h"

diff --git a/snd_win.c b/snd_win.c
index 0f62112c519daaf3260630b7be6683037c7bcea4..490edd292d92ba1163a9719fa28586701d133292 100644 (file)
--- a/snd_win.c
+++ b/snd_win.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "snd_main.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 
 extern HWND mainwindow;

diff --git a/sys_linux.c b/sys_linux.c
index 1edb74ddcf42ed8421f6eb18dfda882372626fab..6264af67cdf3130feef0c559d2d62ea33700c5d6 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -76,6 +76,7 @@ double Sys_DoubleTime (void)
        static double oldtime = 0.0, curtime = 0.0;
        double newtime;
 #ifdef WIN32
+#include <mmsystem.h>
        // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
        if (sys_usetimegettime.integer)
        {

diff --git a/sys_win.c b/sys_win.c
index d3da31c087af20c990d4bfd87f6a19a7b2b37e5e..c5fdb0c35581bb9dfcb381ad0e66180b27e7b7a8 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include "errno.h"
 #include "resource.h"
@@ -316,7 +317,7 @@ void Sys_InitConsole (void)
                hinput = GetStdHandle (STD_INPUT_HANDLE);
                houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
-#ifdef WIN64
+#ifdef _WIN64
 #define atoi _atoi64
 #endif
        // give QHOST a chance to hook into the console

diff --git a/vid_wgl.c b/vid_wgl.c
index a06465d1f32eda83d1de0293e52875b9450577d4..1b05d59d007b7cfbd19fa02d8644d7a125c0e6db 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -24,9 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include "resource.h"
 #include <commctrl.h>
+#include <dinput.h>
 
 extern void S_BlockSound (void);
 extern void S_UnblockSound (void);
@@ -115,8 +117,6 @@ static qboolean dinput;
 
 // input code
 
-#include <dinput.h>
-
 #define DINPUT_BUFFERSIZE           16
 #define iDirectInputCreate(a,b,c,d)    pDirectInputCreate(a,b,c,d)