From 514a4a56cbd110e3ea98404d1bf3845b6875c340 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 28 Sep 2001 16:29:34 +0000
Subject: [PATCH] fix a win32 namespace issue

---
 include/winquake.h     | 2 ++
 qw/source/cl_sys_sdl.c | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/winquake.h b/include/winquake.h
index 03588b2b5..e3bc4d067 100644
--- a/include/winquake.h
+++ b/include/winquake.h
@@ -36,6 +36,7 @@
 #endif
 
 #define byte __hide_byte
+#define shutdown __hide_shutdown
 
 #define LPCWAVEFORMATEX __hide_LPCWAVEFORMATEX
 #include <windows.h>
@@ -56,6 +57,7 @@
 #endif
 
 #undef byte
+#undef shutdown
 
 #include "QF/qtypes.h"
 
diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c
index dfce5bc48..5daae5f0a 100644
--- a/qw/source/cl_sys_sdl.c
+++ b/qw/source/cl_sys_sdl.c
@@ -30,9 +30,6 @@ static const char rcsid[] =
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#ifdef _WIN32
-# define shutdown win32_shutdown
-#endif
 #ifdef HAVE_CONIO_H
 # include <conio.h>
 #endif
@@ -65,10 +62,6 @@ static const char rcsid[] =
 #include <SDL.h>
 #include <SDL_main.h>
 
-#ifdef _WIN32
-# undef shutdown
-#endif
-
 #include "QF/sys.h"
 #include "QF/qargs.h"