mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-26 22:31:05 +00:00
fix a win32 namespace issue
This commit is contained in:
parent
8e27422c72
commit
514a4a56cb
2 changed files with 2 additions and 7 deletions
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in a new issue