Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed duplicate typedefs in DirectX headers

Browse source 
svn path=/trunk/; revision=32403
This commit is contained in:
Gregor Brunmar 2008-02-17 14:40:23 +00:00
parent aea05840ef
commit 751b0ea821
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/include/ddk/ddrawint.h
View file

@ -57,7 +57,10 @@ extern "C" {
#define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) ) #define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
#endif #endif
#ifndef FLATPTR_DEFINED
typedef ULONG_PTR FLATPTR; typedef ULONG_PTR FLATPTR;
#define FLATPTR_DEFINED
#endif
typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL;

20
reactos/include/ddk/dmemmgr.h
View file

@ -17,10 +17,21 @@ extern "C" {
#endif #endif
#ifndef __NTDDKCOMP__ #ifndef __NTDDKCOMP__
#ifndef FLATPTR_DEFINED
typedef ULONG_PTR FLATPTR; typedef ULONG_PTR FLATPTR;
#define FLATPTR_DEFINED
#endif
typedef struct _VIDMEM *LPVIDMEM; typedef struct _VIDMEM *LPVIDMEM;
#else #else
#ifndef FLATPTR_DEFINED
typedef ULONG_PTR FLATPTR; typedef ULONG_PTR FLATPTR;
#define FLATPTR_DEFINED
#endif
typedef struct _VIDEOMEMORY *LPVIDMEM; typedef struct _VIDEOMEMORY *LPVIDMEM;
#endif #endif
@ -115,15 +126,6 @@ typedef struct _VMEMHEAP
DWORD dwAgpCommitMaskSize; DWORD dwAgpCommitMaskSize;
} VMEMHEAP, *LPVMEMHEAP; } 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 void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr);
extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height); extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);