From e40f53753f231945020b5f134c0217da6988f801 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Fri, 21 Nov 2008 21:12:53 +0000 Subject: [PATCH] - 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 svn path=/trunk/; revision=37527 --- reactos/include/ndk/umtypes.h | 3 ++- reactos/include/psdk/ntsecapi.h | 3 --- reactos/include/psdk/ntsecpkg.h | 3 --- reactos/include/psdk/subauth.h | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index cb851976f9a..75c79d0e149 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -122,13 +122,14 @@ typedef short CSHORT; 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 { USHORT Length; diff --git a/reactos/include/psdk/ntsecapi.h b/reactos/include/psdk/ntsecapi.h index f4490a4a46e..4ea4a2ce143 100644 --- a/reactos/include/psdk/ntsecapi.h +++ b/reactos/include/psdk/ntsecapi.h @@ -1,8 +1,5 @@ #ifndef _NTSECAPI_H #define _NTSECAPI_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { diff --git a/reactos/include/psdk/ntsecpkg.h b/reactos/include/psdk/ntsecpkg.h index 3b5dbcd8a7a..f4e37c2e310 100644 --- a/reactos/include/psdk/ntsecpkg.h +++ b/reactos/include/psdk/ntsecpkg.h @@ -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 diff --git a/reactos/include/psdk/subauth.h b/reactos/include/psdk/subauth.h index 112b62f039a..c0172a819b9 100644 --- a/reactos/include/psdk/subauth.h +++ b/reactos/include/psdk/subauth.h @@ -1,8 +1,5 @@ #ifndef _SUBAUTH_H #define _SUBAUTH_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" {