[ros-diffs] [sginsberg] 37527: - Protect NTSTATUS definition in NDK with a guard, as is done in the user mode headers which also define this type - Remove system_header from these user mode headers

Author: sginsberg
Date: Fri Nov 21 15:12:53 2008
New Revision: 37527

URL: http://svn.reactos.org/svn/reactos?rev=37527&view=rev
Log:
- Protect NTSTATUS definition in NDK with a guard, as is done in the user mode headers
which also define this type
- Remove system_header from these user mode headers

Modified:
    trunk/reactos/include/ndk/umtypes.h
    trunk/reactos/include/psdk/ntsecapi.h
    trunk/reactos/include/psdk/ntsecpkg.h
    trunk/reactos/include/psdk/subauth.h

Modified: trunk/reactos/include/ndk/umtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/umtypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/umtypes.h [iso-8859-1] Fri Nov 21 15:12:53 2008
@@ -122,12 +122,13 @@
 typedef CSHORT *PCSHORT;
 typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;
 typedef LONG KPRIORITY;
-typedef LONG NTSTATUS, *PNTSTATUS;
 
 //
 // Basic NT Types
 //
 #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) &&
!defined(_NTSECAPI_)
+
+typedef LONG NTSTATUS, *PNTSTATUS;
 
 typedef struct _UNICODE_STRING
 {

Modified: trunk/reactos/include/psdk/ntsecapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re…
==============================================================================
--- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Fri Nov 21 15:12:53 2008
@@ -1,8 +1,5 @@
 #ifndef _NTSECAPI_H
 #define _NTSECAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/reactos/include/psdk/ntsecpkg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecpkg.h?re…
==============================================================================
--- trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] Fri Nov 21 15:12:53 2008
@@ -18,9 +18,6 @@
 
 #ifndef _NTSECPKG_H
 #define _NTSECPKG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 /* Flags for the MachineState field in SECPKG_PARAMETERS */
 #define SECPKG_STATE_ENCRYPTION_PERMITTED               0x01

Modified: trunk/reactos/include/psdk/subauth.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/subauth.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/subauth.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/subauth.h [iso-8859-1] Fri Nov 21 15:12:53 2008
@@ -1,8 +1,5 @@
 #ifndef _SUBAUTH_H
 #define _SUBAUTH_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {