[ros-diffs] [tkreuzer] 66267: [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 define...

Author: tkreuzer
Date: Sat Feb 14 17:04:42 2015
New Revision: 66267

URL: http://svn.reactos.org/svn/reactos?rev=66267&view=rev
Log:
[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.

Modified:
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/include/xdk/winnt.template.h

Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6…
==============================================================================
--- trunk/reactos/include/psdk/winnt.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h	[iso-8859-1] Sat Feb 14 17:04:42 2015
@@ -20,6 +20,7 @@
  */
 
 #pragma once
+#ifndef _WINNT_
 #define _WINNT_
 
 /* We require WDK / VS 2008 or newer */
@@ -6130,3 +6131,5 @@
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
+#endif /* _WINNT_ */

Modified: trunk/reactos/include/xdk/winnt.template.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt.template…
==============================================================================
--- trunk/reactos/include/xdk/winnt.template.h	[iso-8859-1] (original)
+++ trunk/reactos/include/xdk/winnt.template.h	[iso-8859-1] Sat Feb 14 17:04:42 2015
@@ -20,6 +20,7 @@
  */
 
 #pragma once
+#ifndef _WINNT_
 #define _WINNT_
 
 /* We require WDK / VS 2008 or newer */
@@ -74,3 +75,5 @@
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
+#endif /* _WINNT_ */