Author: gbrunmar Date: Sun Feb 17 17:51:26 2008 New Revision: 32404
URL: http://svn.reactos.org/svn/reactos?rev=32404&view=rev Log: Fixed duplicate typedef in DirectX headers for real this time :)
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:51:26 2008 @@ -68,7 +68,10 @@ /* _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 */
Modified: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=3... ============================================================================== --- trunk/reactos/include/ddk/dmemmgr.h (original) +++ trunk/reactos/include/ddk/dmemmgr.h Sun Feb 17 17:51:26 2008 @@ -126,6 +126,20 @@ 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);