From aa6f9c2d055da0beaa5d96659bdd386ac081963e Mon Sep 17 00:00:00 2001
From: Gregor Brunmar <gbrunmar.ros@gmail.com>
Date: Sun, 17 Feb 2008 14:51:26 +0000
Subject: [PATCH] Fixed duplicate typedef in DirectX headers for real this time
 :)

svn path=/trunk/; revision=32404
---
 reactos/include/ddk/ddrawint.h |  3 +++
 reactos/include/ddk/dmemmgr.h  | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/reactos/include/ddk/ddrawint.h b/reactos/include/ddk/ddrawint.h
index 682fd6b955a..95517771799 100644
--- a/reactos/include/ddk/ddrawint.h
+++ b/reactos/include/ddk/ddrawint.h
@@ -68,7 +68,10 @@ typedef struct _DD_VIDEOPORT_LOCAL   *PDD_VIDEOPORT_LOCAL;
 /* _DD_GETHEAPALIGNMENTDATA is defined in dmemmgr.h                     */
  /************************************************************************/
 struct _DD_GETHEAPALIGNMENTDATA;
+#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED
 typedef struct _DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA;
+#define DD_GETHEAPALIGNMENTDATA_DECLARED
+#endif
 
 /************************************************************************/
 /* Video memory info structures                                         */
diff --git a/reactos/include/ddk/dmemmgr.h b/reactos/include/ddk/dmemmgr.h
index 7c5679b256a..b62ef0d647d 100644
--- a/reactos/include/ddk/dmemmgr.h
+++ b/reactos/include/ddk/dmemmgr.h
@@ -126,6 +126,20 @@ typedef struct _VMEMHEAP
     DWORD dwAgpCommitMaskSize;
 } VMEMHEAP, *LPVMEMHEAP;
 
+typedef struct _DD_GETHEAPALIGNMENTDATA
+{
+    ULONG_PTR dwInstance;
+    DWORD dwHeap;
+    HRESULT ddRVal;
+    VOID* GetHeapAlignment;
+    HEAPALIGNMENT Alignment;
+} DD_GETHEAPALIGNMENTDATA;
+
+#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED
+typedef DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA;
+#define DD_GETHEAPALIGNMENTDATA_DECLARED
+#endif
+
 extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr);
 extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);