diff --git a/src/sound/except.h b/src/sound/except.h index 10b484130..45c952805 100644 --- a/src/sound/except.h +++ b/src/sound/except.h @@ -26,7 +26,14 @@ inline int CheckException(DWORD code) #else +#ifdef __try +#undef __try +#endif #define __try + +#ifdef __except +#undef __except +#endif #define __except(a) if (0) #endif diff --git a/src/sound/mpg123_decoder.cpp b/src/sound/mpg123_decoder.cpp index 551fe8434..5b33100a5 100644 --- a/src/sound/mpg123_decoder.cpp +++ b/src/sound/mpg123_decoder.cpp @@ -3,10 +3,10 @@ #include #define USE_WINDOWS_DWORD #endif -#include "except.h" #include "mpg123_decoder.h" #include "files.h" +#include "except.h" #ifdef HAVE_MPG123 static bool inited = false; diff --git a/src/sound/sndfile_decoder.cpp b/src/sound/sndfile_decoder.cpp index a5b10faf3..52376a6c7 100644 --- a/src/sound/sndfile_decoder.cpp +++ b/src/sound/sndfile_decoder.cpp @@ -3,12 +3,12 @@ #include #define USE_WINDOWS_DWORD #endif -#include "except.h" #include "sndfile_decoder.h" #include "templates.h" #include "files.h" #include "xs_Float.h" +#include "except.h" #ifdef HAVE_SNDFILE