From d932c7c5bf0e891393063aa025e1bd6e83e8f353 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 14 Feb 2015 17:04:42 +0000 Subject: [PATCH] [PSDK] Add #ifdef include guards to winnt.h. RC doesn't seem to support #pragma once and emits a redefinition warning, since with RC we first include winnt.h without STRICT defined, then again from windef.h with STRICT defined. svn path=/trunk/; revision=66267 --- reactos/include/psdk/winnt.h | 3 +++ reactos/include/xdk/winnt.template.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index de89e859e64..3e51663e8b9 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -20,6 +20,7 @@ */ #pragma once +#ifndef _WINNT_ #define _WINNT_ /* We require WDK / VS 2008 or newer */ @@ -6130,3 +6131,5 @@ typedef struct _TP_CALLBACK_ENVIRON_V1 { #ifdef __cplusplus } // extern "C" #endif + +#endif /* _WINNT_ */ diff --git a/reactos/include/xdk/winnt.template.h b/reactos/include/xdk/winnt.template.h index 7d948e09c64..23cca81710c 100644 --- a/reactos/include/xdk/winnt.template.h +++ b/reactos/include/xdk/winnt.template.h @@ -20,6 +20,7 @@ */ #pragma once +#ifndef _WINNT_ #define _WINNT_ /* We require WDK / VS 2008 or newer */ @@ -74,3 +75,5 @@ $include(winnt_old.h) #ifdef __cplusplus } // extern "C" #endif + +#endif /* _WINNT_ */