[ros-diffs] [tkreuzer] 56743: [PSDK] Fix winnt.h include guard definition

Author: tkreuzer
Date: Sun Jun 17 16:06:33 2012
New Revision: 56743

URL: http://svn.reactos.org/svn/reactos?rev=56743&view=rev
Log:
[PSDK]
Fix winnt.h include guard definition

Modified:
    trunk/reactos/include/psdk/ddraw.h
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/include/reactos/arm/armddk.h
    trunk/reactos/include/reactos/idl/lsa.idl
    trunk/reactos/include/reactos/idl/ms-dtyp.idl
    trunk/reactos/include/reactos/idl/sam.idl

Modified: trunk/reactos/include/psdk/ddraw.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?rev=5…
==============================================================================
--- trunk/reactos/include/psdk/ddraw.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ddraw.h [iso-8859-1] Sun Jun 17 16:06:33 2012
@@ -7,7 +7,7 @@
 #include <objbase.h>
 #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

Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5…
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jun 17 16:06:33 2012
@@ -1,5 +1,5 @@
-#ifndef _WINNT_H
-#define _WINNT_H
+#ifndef _WINNT_
+#define _WINNT_
 
 #if !defined(__ROS_LONG64__)
 #ifdef __WINESRC__

Modified: trunk/reactos/include/reactos/arm/armddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk…
==============================================================================
--- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Sun Jun 17 16:06:33 2012
@@ -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 @@
 //
 // Processor Control Region
 //
-#ifdef _WINNT_H
+#ifdef _WINNT_
 #define KIRQL ULONG
 #endif
 
@@ -241,7 +241,7 @@
 KfAcquireSpinLock(
   IN OUT ULONG_PTR* SpinLock);
 
-#ifndef _WINNT_H
+#ifndef _WINNT_
 //
 // IRQL Support on ARM is similar to MIPS/ALPHA
 //

Modified: trunk/reactos/include/reactos/idl/lsa.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id…
==============================================================================
--- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Jun 17 16:06:33 2012
@@ -9,7 +9,7 @@
 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 @@
     [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 @@
     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;

Modified: trunk/reactos/include/reactos/idl/ms-dtyp.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty…
==============================================================================
--- trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Sun Jun 17 16:06:33 2012
@@ -26,11 +26,11 @@
 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 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 @@
 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 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 @@
 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;

Modified: trunk/reactos/include/reactos/idl/sam.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id…
==============================================================================
--- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Jun 17 16:06:33 2012
@@ -59,7 +59,7 @@
     [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,