* d3dtypes.h (LPD3DVECTOR): Guard.
	* d3d8types.h (D3DVECTOR): Guard.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3162 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/direct-x/ChangeLog

diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog
index 2c79257..e7ae1c5 100644
--- a/mingw-w64-headers/direct-x/ChangeLog
+++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-06  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* d3dtypes.h (LPD3DVECTOR): Guard.
+	* d3d8types.h (D3DVECTOR): Guard.
+
 2010-08-04  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* d3d8types.h (D3DCLEAR_TARGET): Guard.

mingw-w64-headers/direct-x/include/d3d8types.h

diff --git a/mingw-w64-headers/direct-x/include/d3d8types.h b/mingw-w64-headers/direct-x/include/d3d8types.h
index ffadf61..7c24b73 100644
--- a/mingw-w64-headers/direct-x/include/d3d8types.h
+++ b/mingw-w64-headers/direct-x/include/d3d8types.h
@@ -1061,11 +1061,14 @@
     UINT                Size;
 } D3DINDEXBUFFER_DESC;
 
+#ifndef D3DVECTOR_DEFINED
 typedef struct _D3DVECTOR {
     float x;
     float y;
     float z;
 } D3DVECTOR;
+#define D3DVECTOR_DEFINED
+#endif
 
 typedef struct _D3DLIGHT8 {
     D3DLIGHTTYPE    Type;

mingw-w64-headers/direct-x/include/d3dtypes.h

diff --git a/mingw-w64-headers/direct-x/include/d3dtypes.h b/mingw-w64-headers/direct-x/include/d3dtypes.h
index 51e9193..2ac2cff 100644
--- a/mingw-w64-headers/direct-x/include/d3dtypes.h
+++ b/mingw-w64-headers/direct-x/include/d3dtypes.h
@@ -140,10 +140,15 @@
   friend D3DVALUE DotProduct(const _D3DVECTOR& v1, const _D3DVECTOR& v2);
   friend _D3DVECTOR CrossProduct(const _D3DVECTOR& v1, const _D3DVECTOR& v2);
 #endif
-} D3DVECTOR,*LPD3DVECTOR;
+} D3DVECTOR;
 #define D3DVECTOR_DEFINED
 #endif
 
+#ifndef LPD3DVECTOR_DEFINED
+typedef D3DVECTOR *LPD3DVECTOR;
+#define LPD3DVECTOR_DEFINED
+#endif
+
 #define DX_SHARED_DEFINES
 #endif /* DX_SHARED_DEFINES */