Author: gbrunmar
Date: Sun Feb 17 17:40:23 2008
New Revision: 32403
URL:
http://svn.reactos.org/svn/reactos?rev=32403&view=rev
Log:
Fixed duplicate typedefs in DirectX headers
Modified:
trunk/reactos/include/ddk/ddrawint.h
trunk/reactos/include/ddk/dmemmgr.h
Modified: trunk/reactos/include/ddk/ddrawint.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/ddrawint.h (original)
+++ trunk/reactos/include/ddk/ddrawint.h Sun Feb 17 17:40:23 2008
@@ -57,7 +57,10 @@
#define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((unsigned long)(sev)<<31) |
((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
#endif
+#ifndef FLATPTR_DEFINED
typedef ULONG_PTR FLATPTR;
+#define FLATPTR_DEFINED
+#endif
typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL;
Modified: trunk/reactos/include/ddk/dmemmgr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/dmemmgr.h (original)
+++ trunk/reactos/include/ddk/dmemmgr.h Sun Feb 17 17:40:23 2008
@@ -17,10 +17,21 @@
#endif
#ifndef __NTDDKCOMP__
+
+#ifndef FLATPTR_DEFINED
typedef ULONG_PTR FLATPTR;
+#define FLATPTR_DEFINED
+#endif
+
typedef struct _VIDMEM *LPVIDMEM;
+
#else
+
+#ifndef FLATPTR_DEFINED
typedef ULONG_PTR FLATPTR;
+#define FLATPTR_DEFINED
+#endif
+
typedef struct _VIDEOMEMORY *LPVIDMEM;
#endif
@@ -115,15 +126,6 @@
DWORD dwAgpCommitMaskSize;
} VMEMHEAP, *LPVMEMHEAP;
-typedef struct _DD_GETHEAPALIGNMENTDATA
-{
- ULONG_PTR dwInstance;
- DWORD dwHeap;
- HRESULT ddRVal;
- VOID* GetHeapAlignment;
- HEAPALIGNMENT Alignment;
-} DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA;
-
extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr);
extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);