From 425ddbf45ad91397709c5753f94bbe2eeae64770 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Tue, 12 Jun 2007 15:23:28 +0000 Subject: [PATCH] fixing some header problem for portcls svn path=/trunk/; revision=27155 --- reactos/include/ddk/punknown.h | 3 +++ reactos/include/ddk/winddk.h | 3 +++ reactos/include/psdk/winnt.h | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/reactos/include/ddk/punknown.h b/reactos/include/ddk/punknown.h index a29312bb31b..75d2ef3bb4a 100644 --- a/reactos/include/ddk/punknown.h +++ b/reactos/include/ddk/punknown.h @@ -21,6 +21,8 @@ IUnknown */ +#ifndef __IUnknown_INTERFACE_DEFINED__ +#define __IUnknown_INTERFACE_DEFINED__ DEFINE_GUID( IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46); @@ -41,6 +43,7 @@ DECLARE_INTERFACE(IUnknown) STDMETHOD_(ULONG, Release)( THIS ) PURE; }; +#endif #undef INTERFACE diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h index 2d0c4f452fa..e2dae11f6e0 100644 --- a/reactos/include/ddk/winddk.h +++ b/reactos/include/ddk/winddk.h @@ -132,7 +132,10 @@ struct _SCATTER_GATHER_LIST; struct _DRIVE_LAYOUT_INFORMATION; struct _DRIVE_LAYOUT_INFORMATION_EX; +#ifndef _SECURITY_ATTRIBUTES_ +#define _SECURITY_ATTRIBUTES_ typedef PVOID PSECURITY_DESCRIPTOR; +#endif typedef ULONG SECURITY_INFORMATION, *PSECURITY_INFORMATION; typedef PVOID PSID; diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index 3b821de888d..5441960010c 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -2539,6 +2539,9 @@ typedef struct _TOKEN_USER { } TOKEN_USER, *PTOKEN_USER; typedef DWORD SECURITY_INFORMATION,*PSECURITY_INFORMATION; typedef WORD SECURITY_DESCRIPTOR_CONTROL,*PSECURITY_DESCRIPTOR_CONTROL; + +#ifndef _SECURITY_ATTRIBUTES_ +#define _SECURITY_ATTRIBUTES_ typedef struct _SECURITY_DESCRIPTOR { BYTE Revision; BYTE Sbz1; @@ -2548,6 +2551,7 @@ typedef struct _SECURITY_DESCRIPTOR { PACL Sacl; PACL Dacl; } SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; +#endif typedef struct _SECURITY_DESCRIPTOR_RELATIVE { BYTE Revision; BYTE Sbz1;