From 8bf0a0e63b2c9998aa79491da2f31fd6d73dd49c Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 22 Mar 2006 09:18:03 +0000 Subject: [PATCH] another WIN32_LEAN_AND_MEAN patch from Willis, this one for non-SDL client and dedicated server git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6168 d7cf8633-e32d-0410-b094-e92efae38249 --- cd_win.c | 1 + snd_win.c | 1 + sys_linux.c | 1 + sys_win.c | 3 ++- vid_wgl.c | 4 ++-- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cd_win.c b/cd_win.c index 41f2a3ca..5b475496 100644 --- 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 +#include #include "quakedef.h" #include "cdaudio.h" diff --git a/snd_win.c b/snd_win.c index 0f62112c..490edd29 100644 --- 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 +#include #include extern HWND mainwindow; diff --git a/sys_linux.c b/sys_linux.c index 1edb74dd..6264af67 100644 --- 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 // 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 d3da31c0..c5fdb0c3 100644 --- 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 +#include #include #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 a06465d1..1b05d59d 100644 --- 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 +#include #include #include "resource.h" #include +#include extern void S_BlockSound (void); extern void S_UnblockSound (void); @@ -115,8 +117,6 @@ static qboolean dinput; // input code -#include - #define DINPUT_BUFFERSIZE 16 #define iDirectInputCreate(a,b,c,d) pDirectInputCreate(a,b,c,d) -- 2.39.2