From 4d5f12ccdaadfab4b0360c346893f94fedaa9d3a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sat, 4 Jun 2011 14:01:11 +0100 Subject: [PATCH] Tweak the include order to avoid symbol conflicts. Due to __out macro being defined. --- compat.h | 3 ++- d3d9.py | 6 +++--- d3dshader.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/compat.h b/compat.h index cc6f70e..f1d3028 100644 --- 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 4a4bd42..7b2329c 100644 --- 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 13987f4..d3101d0 100644 --- a/d3dshader.cpp +++ b/d3dshader.cpp @@ -27,8 +27,8 @@ #include -#include "d3d9imports.hpp" #include "d3dshader.hpp" +#include "d3d9imports.hpp" typedef HRESULT -- 2.45.2