Tweak the include order to avoid symbol conflicts.

Due to __out macro being defined.

diff --git a/compat.h b/compat.h
index cc6f70e7dfca02ebd16b4fc82d2e5e65a43b49d8..f1d302878e212a3deb2e0f3c73371732aaa8a87f 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -28,6 +28,7 @@
  */
 
 #ifdef __MINGW32__
+
 #define __in /**/
 #define __out /**/
 #define __inout /**/
@@ -52,5 +53,5 @@
 
 #define UINT8 uint8_t
 
-#endif
+#endif /* __MINGW32__ */
 

diff --git a/d3d9.py b/d3d9.py
index 4a4bd4251c53ce76fe6c8d8c6f7948b98338110f..7b2329cfdf0f087703873de3d1423a43dd2a4b37 100644 (file)
--- a/d3d9.py
+++ b/d3d9.py
@@ -462,12 +462,12 @@ class D3D9Tracer(DllTracer):
 
 
 if __name__ == '__main__':
-    print '#include "d3d9imports.hpp"'
-    print '#include "d3dshader.hpp"'
-    print
     print '#include "trace_writer.hpp"'
     print '#include "os.hpp"'
     print
+    print '#include "d3d9imports.hpp"'
+    print '#include "d3dshader.hpp"'
+    print
     tracer = D3D9Tracer('d3d9.dll')
     tracer.trace_api(d3d9)
 

diff --git a/d3dshader.cpp b/d3dshader.cpp
index 13987f4b0d9cb6de4509a5d13f039c7159f6bc93..d3101d0103de7c81592e50a3a46782cdd28e7820 100644 (file)
--- a/d3dshader.cpp
+++ b/d3dshader.cpp
@@ -27,8 +27,8 @@
 
 #include <stdio.h>
 
-#include "d3d9imports.hpp"
 #include "d3dshader.hpp"
+#include "d3d9imports.hpp"
 
 
 typedef HRESULT