zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- reshuffled some stuff to satisfy Linux compilers (hopefully)

This commit is contained in:
Christoph Oelckers 2015-04-27 13:19:34 +02:00
parent d46ba7bfb7
commit 47e7a30cab
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sound/except.h
View File

@ -26,7 +26,14 @@ inline int CheckException(DWORD code)
#else #else
#ifdef __try
#undef __try
#endif
#define __try #define __try
#ifdef __except
#undef __except
#endif
#define __except(a) if (0) #define __except(a) if (0)
#endif #endif

2
src/sound/mpg123_decoder.cpp
View File

@ -3,10 +3,10 @@
#include <windows.h> #include <windows.h>
#define USE_WINDOWS_DWORD #define USE_WINDOWS_DWORD
#endif #endif
#include "except.h"
#include "mpg123_decoder.h" #include "mpg123_decoder.h"
#include "files.h" #include "files.h"
#include "except.h"
#ifdef HAVE_MPG123 #ifdef HAVE_MPG123
static bool inited = false; static bool inited = false;

2
src/sound/sndfile_decoder.cpp
View File

@ -3,12 +3,12 @@
#include <windows.h> #include <windows.h>
#define USE_WINDOWS_DWORD #define USE_WINDOWS_DWORD
#endif #endif
#include "except.h"
#include "sndfile_decoder.h" #include "sndfile_decoder.h"
#include "templates.h" #include "templates.h"
#include "files.h" #include "files.h"
#include "xs_Float.h" #include "xs_Float.h"
#include "except.h"
#ifdef HAVE_SNDFILE #ifdef HAVE_SNDFILE