summaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2015-07-20 14:44:56 +0100
committerJose Fonseca <jfonseca@vmware.com>2015-07-20 14:44:56 +0100
commit27169800d153342829ddd1fe12e6217276c10bfa (patch)
treef92f5178a991aae001495c489376b2d8293fb334 /thirdparty
parentcacd27c973f6c84d13a67adaf5d6fce4ae898e9e (diff)
dxerr: Avoid macro redefinition warnings.
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/dxerr/dxerr.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/thirdparty/dxerr/dxerr.cpp b/thirdparty/dxerr/dxerr.cpp
index a1ceadee..0be20337 100644
--- a/thirdparty/dxerr/dxerr.cpp
+++ b/thirdparty/dxerr/dxerr.cpp
@@ -20,7 +20,6 @@
#ifdef __MINGW32__
#include "compat.h"
-#include "d3derr.hpp"
#endif
#ifdef HAVE_DDRAW
@@ -54,6 +53,10 @@
#include <dwrite.h>
#endif
+#ifdef __MINGW32__
+#include "d3derr.hpp"
+#endif
+
#define XAUDIO2_E_INVALID_CALL 0x88960001
#define XAUDIO2_E_XMA_DECODER_ERROR 0x88960002
#define XAUDIO2_E_XAPO_CREATION_FAILED 0x88960003