[PATCH] d3dx9: Fix and unify inclusions in the d3dx9 headers

[Tony Wasserka]

---
 include/d3dx9.h       |    6 +++---
 include/d3dx9core.h   |    4 ++--
 include/d3dx9math.h   |   10 +++++-----
 include/d3dx9mesh.h   |    4 ++--
 include/d3dx9shader.h |    8 ++++----
 include/d3dx9tex.h    |    2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/d3dx9.h b/include/d3dx9.h
index 6b3bdf6..7866282 100644
--- a/include/d3dx9.h
+++ b/include/d3dx9.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __D3DX9_H__
-#define __D3DX9_H__
+#ifndef __WINE_D3DX9_H__
+#define __WINE_D3DX9_H__
 
 #include <limits.h>
 
@@ -43,4 +43,4 @@ enum _D3DXERR {
     D3DXERR_CANNOTREMOVELASTITEM    = MAKE_DDHRESULT(2908),
 };
 
-#endif
+#endif /* __WINE_D3DX9_H__ */
diff --git a/include/d3dx9core.h b/include/d3dx9core.h
index 9a108fa..088e32a 100644
--- a/include/d3dx9core.h
+++ b/include/d3dx9core.h
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "d3dx9.h"
+
 #ifndef __WINE_D3DX9CORE_H
 #define __WINE_D3DX9CORE_H
 
-#include <d3dx9.h>
-
 /**********************************************
  ***************** Definitions ****************
  **********************************************/
diff --git a/include/d3dx9math.h b/include/d3dx9math.h
index 83b8749..0d3e28e 100644
--- a/include/d3dx9math.h
+++ b/include/d3dx9math.h
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <d3dx9.h>
+#include "d3dx9.h"
 
-#ifndef __D3DX9MATH_H__
-#define __D3DX9MATH_H__
+#ifndef __WINE_D3DX9MATH_H__
+#define __WINE_D3DX9MATH_H__
 
 #include <math.h>
 
@@ -358,6 +358,6 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, CO
 }
 #endif
 
-#include <d3dx9math.inl>
+#include "d3dx9math.inl"
 
-#endif /* __D3DX9MATH_H__ */
+#endif /* __WINE_D3DX9MATH_H__ */
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
index a85f80d..7fb6317 100644
--- a/include/d3dx9mesh.h
+++ b/include/d3dx9mesh.h
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "d3dx9.h"
+
 #ifndef __WINE_D3DX9MESH_H
 #define __WINE_D3DX9MESH_H
 
-#include <d3dx9.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h
index a50b72a..ff1e62d 100644
--- a/include/d3dx9shader.h
+++ b/include/d3dx9shader.h
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __D3DX9SHADER_H__
-#define __D3DX9SHADER_H__
-
 #include "d3dx9.h"
 
+#ifndef __WINE_D3DX9SHADER_H__
+#define __WINE_D3DX9SHADER_H__
+
 typedef LPCSTR D3DXHANDLE;
 
 typedef enum D3DXPARAMETER_CLASS
@@ -78,4 +78,4 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device);
 }
 #endif
 
-#endif /* __D3DX9SHADER_H__ */
+#endif /* __WINE_D3DX9SHADER_H__ */
diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h
index 8e553e0..2695e3d 100644
--- a/include/d3dx9tex.h
+++ b/include/d3dx9tex.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <d3dx9.h>
+#include "d3dx9.h"
 
 #ifndef __WINE_D3DX9TEX_H
 #define __WINE_D3DX9TEX_H
-- 
1.5.6.6


--------------020205090303080009050402--