From 03bea4140f288e429017f62c6045c837c29e0694 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 17 Jun 2012 16:06:33 +0000 Subject: [PATCH] [PSDK] Fix winnt.h include guard definition svn path=/trunk/; revision=56743 --- reactos/include/psdk/ddraw.h | 2 +- reactos/include/psdk/winnt.h | 4 ++-- reactos/include/reactos/arm/armddk.h | 8 ++++---- reactos/include/reactos/idl/lsa.idl | 6 +++--- reactos/include/reactos/idl/ms-dtyp.idl | 20 ++++++++++---------- reactos/include/reactos/idl/sam.idl | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/reactos/include/psdk/ddraw.h b/reactos/include/psdk/ddraw.h index 7dac04e13d2..47ce451fb08 100644 --- a/reactos/include/psdk/ddraw.h +++ b/reactos/include/psdk/ddraw.h @@ -7,7 +7,7 @@ #include #else #define IUnknown void -#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H) +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_) #define CO_E_NOTINITIALIZED 0x800401F0L #endif #endif diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index 6ef0befa37f..b9e98922bdf 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -1,5 +1,5 @@ -#ifndef _WINNT_H -#define _WINNT_H +#ifndef _WINNT_ +#define _WINNT_ #if !defined(__ROS_LONG64__) #ifdef __WINESRC__ diff --git a/reactos/include/reactos/arm/armddk.h b/reactos/include/reactos/arm/armddk.h index 9438709aeb8..8def891f857 100644 --- a/reactos/include/reactos/arm/armddk.h +++ b/reactos/include/reactos/arm/armddk.h @@ -8,7 +8,7 @@ #define PAGE_SIZE 0x1000 #endif -#ifndef _WINNT_H +#ifndef _WINNT_ // // IRQLs // @@ -34,7 +34,7 @@ #define PCR ((KPCR * const)KIP0PCRADDRESS) #define USERPCR ((volatile KPCR * const)USPCR) #define KeGetPcr() PCR -#ifndef _WINNT_H +#ifndef _WINNT_ #define SharedUserData ((KUSER_SHARED_DATA * const)KI_USER_SHARED_DATA) // @@ -124,7 +124,7 @@ typedef struct _CONTEXT { // // Processor Control Region // -#ifdef _WINNT_H +#ifdef _WINNT_ #define KIRQL ULONG #endif @@ -241,7 +241,7 @@ __fastcall KfAcquireSpinLock( IN OUT ULONG_PTR* SpinLock); -#ifndef _WINNT_H +#ifndef _WINNT_ // // IRQL Support on ARM is similar to MIPS/ALPHA // diff --git a/reactos/include/reactos/idl/lsa.idl b/reactos/include/reactos/idl/lsa.idl index 93295bbbc39..c1484b481c3 100644 --- a/reactos/include/reactos/idl/lsa.idl +++ b/reactos/include/reactos/idl/lsa.idl @@ -9,7 +9,7 @@ typedef [handle] LPWSTR PLSAPR_SERVER_NAME; typedef [context_handle] PVOID LSAPR_HANDLE; typedef LSAPR_HANDLE *PLSAPR_HANDLE; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef struct _LUID { DWORD LowPart; LONG HighPart; @@ -33,7 +33,7 @@ typedef struct _LSAPR_ACL { [size_is(AclSize - 4)] BYTE Dummy1[*]; } LSAPR_ACL, *PLSAPR_ACL; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; cpp_quote("#endif") @@ -282,7 +282,7 @@ typedef struct _POLICY_LSA_REPLICA_SRCE_INFO { RPC_UNICODE_STRING ReplicaAccountName; } POLICY_LSA_REPLICA_SRCE_INFO, *PPOLICY_LSA_REPLICA_SRCE_INFO; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef struct _QUOTA_LIMITS { INT64 PagedPoolLimit; INT64 NonPagedPoolLimit; diff --git a/reactos/include/reactos/idl/ms-dtyp.idl b/reactos/include/reactos/idl/ms-dtyp.idl index 71b56d11cb2..592d9dabb48 100644 --- a/reactos/include/reactos/idl/ms-dtyp.idl +++ b/reactos/include/reactos/idl/ms-dtyp.idl @@ -26,11 +26,11 @@ typedef signed int LONG32; typedef signed __int64 LONG64; cpp_quote("#endif") typedef unsigned __int64 QWORD; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef short SHORT; cpp_quote("#endif") typedef __int64 TIME; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef char CHAR, *PCHAR; typedef unsigned char UCHAR, *PUCHAR; cpp_quote("#endif") @@ -43,27 +43,27 @@ typedef unsigned short UINT16; typedef unsigned int UINT32; typedef unsigned __int64 UINT64; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef unsigned long ULONG, *PULONG; cpp_quote("#endif") cpp_quote("#ifndef _BASETSD_H") typedef unsigned int ULONG32; typedef unsigned __int64 ULONG64; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef unsigned __int64 ULONGLONG; typedef unsigned short USHORT; cpp_quote("#endif") cpp_quote("#ifndef _WINDEF_H") typedef unsigned short WORD, *PWORD, *LPWORD; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef long LONG, *PLONG; cpp_quote("#endif") cpp_quote("#ifndef _WINDEF_H") typedef long *LPLONG; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef signed __int64 LONGLONG; cpp_quote("#endif") @@ -74,7 +74,7 @@ cpp_quote("#ifndef __wtypes_h__") typedef double DOUBLE; cpp_quote("#endif") -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef BYTE BOOLEAN, *PBOOLEAN; cpp_quote("#endif") cpp_quote("#ifndef _BASETSD_H") @@ -89,13 +89,13 @@ typedef ULONG_PTR SIZE_T; typedef ULONG_PTR DWORD_PTR; cpp_quote("#endif") typedef DWORD NET_API_STATUS; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef ULONGLONG DWORDLONG, *PDWORDLONG; cpp_quote("#endif") typedef DWORD HCALL; //typedef DWORD HRESULT; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef void *HANDLE; typedef void /*VOID,*/ *PVOID; cpp_quote("#endif") @@ -105,7 +105,7 @@ cpp_quote("#endif") typedef [context_handle] void *PCONTEXT_HANDLE; typedef PCONTEXT_HANDLE *PPCONTEXT_HANDLE; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef wchar_t WCHAR, *PWCHAR; cpp_quote("#if 0") typedef wchar_t UNICODE; diff --git a/reactos/include/reactos/idl/sam.idl b/reactos/include/reactos/idl/sam.idl index b31514d3a0f..b205a89a063 100644 --- a/reactos/include/reactos/idl/sam.idl +++ b/reactos/include/reactos/idl/sam.idl @@ -59,7 +59,7 @@ typedef struct _SAMPR_RETURNED_USTRING_ARRAY [size_is(Count)] PRPC_UNICODE_STRING Element; } SAMPR_RETURNED_USTRING_ARRAY, *PSAMPR_RETURNED_USTRING_ARRAY; -cpp_quote("#ifndef _WINNT_H") +cpp_quote("#ifndef _WINNT_") typedef enum _SID_NAME_USE { SidTypeUser = 1,