qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 00:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a win32 namespace issue

Browse source
This commit is contained in:
Bill Currie 2001-09-28 16:29:34 +00:00
parent 8e27422c72
commit 514a4a56cb
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/winquake.h
View file

@ -36,6 +36,7 @@
#endif #endif
#define byte __hide_byte #define byte __hide_byte
#define shutdown __hide_shutdown
#define LPCWAVEFORMATEX __hide_LPCWAVEFORMATEX #define LPCWAVEFORMATEX __hide_LPCWAVEFORMATEX
#include <windows.h> #include <windows.h>
@ -56,6 +57,7 @@
#endif #endif
#undef byte #undef byte
#undef shutdown
#include "QF/qtypes.h" #include "QF/qtypes.h"

7
qw/source/cl_sys_sdl.c
View file

@ -30,9 +30,6 @@ static const char rcsid[] =
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#ifdef _WIN32
# define shutdown win32_shutdown
#endif
#ifdef HAVE_CONIO_H #ifdef HAVE_CONIO_H
# include <conio.h> # include <conio.h>
#endif #endif
@ -65,10 +62,6 @@ static const char rcsid[] =
#include <SDL.h> #include <SDL.h>
#include <SDL_main.h> #include <SDL_main.h>
#ifdef _WIN32
# undef shutdown
#endif
#include "QF/sys.h" #include "QF/sys.h"
#include "QF/qargs.h" #include "QF/qargs.h"