[ros-diffs] [hbelusca] 70984: [PSDK][XDK] - Add few missing #ifdef __GNUC__ before including msvctarget.h. - The contents of intrin.h is included only if RC_INVOKED is not defined. Compatible with MinGW and Wi...

Author: hbelusca
Date: Wed Mar  9 16:54:43 2016
New Revision: 70984

URL: http://svn.reactos.org/svn/reactos?rev=70984&view=rev
Log:
[PSDK][XDK]
- Add few missing #ifdef __GNUC__ before including msvctarget.h.
- The contents of intrin.h is included only if RC_INVOKED is not defined. Compatible with
MinGW and WinSDK.
- Ignore PROBE_ALIGNMENT definition if no platform is defined, in case RC_INVOKED is
defined. Compatible with MinGW and latest WinSDK.
The two last fixes are also necessary to not make the Visual Studio resource compiler
complain when a resource file is opened in it.

Modified:
    trunk/reactos/include/crt/intrin.h
    trunk/reactos/include/psdk/basetsd.h
    trunk/reactos/include/xdk/ntbasedef.h
    trunk/reactos/include/xdk/winnt.template.h

Modified: trunk/reactos/include/crt/intrin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=7…
==============================================================================
--- trunk/reactos/include/crt/intrin.h	[iso-8859-1] (original)
+++ trunk/reactos/include/crt/intrin.h	[iso-8859-1] Wed Mar  9 16:54:43 2016
@@ -1,6 +1,8 @@
 
 #pragma once
 #define __INTRIN_H_
+
+#ifndef RC_INVOKED
 
 #include <crtdefs.h>
 #include <setjmp.h>
@@ -1009,7 +1011,6 @@
 }
 #endif /* __cplusplus */
 
-#ifndef RC_INVOKED
 #if defined(__GNUC__) && defined(_WIN32) // We can't use __MINGW32__ here
 #  include "mingw32/intrin.h"
 #elif defined(_MSC_VER)
@@ -1017,4 +1018,5 @@
 #else
 #  error Please implement intrinsics for your target compiler
 #endif
+
 #endif

Modified: trunk/reactos/include/psdk/basetsd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/basetsd.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/basetsd.h	[iso-8859-1] Wed Mar  9 16:54:43 2016
@@ -2,7 +2,9 @@
 #define _BASETSD_H_
 #pragma once
 
+#ifdef __GNUC__
 #include <msvctarget.h>
+#endif
 
 #ifndef _M_AMD64
 #if !defined(__ROS_LONG64__)

Modified: trunk/reactos/include/xdk/ntbasedef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntbasedef.h?re…
==============================================================================
--- trunk/reactos/include/xdk/ntbasedef.h	[iso-8859-1] (original)
+++ trunk/reactos/include/xdk/ntbasedef.h	[iso-8859-1] Wed Mar  9 16:54:43 2016
@@ -121,8 +121,8 @@
  #define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT($ULONG)
 #elif defined(_IA64_) || defined(_ARM_)
  #define PROBE_ALIGNMENT(_s) max((TYPE_ALIGNMENT(_s), TYPE_ALIGNMENT($ULONG))
-#else
- #error "unknown architecture"
+#elif !defined(RC_INVOKED)
+ #error "Unknown architecture"
 #endif
 
 #if defined(_WIN64)

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] Wed Mar  9 16:54:43 2016
@@ -37,7 +37,9 @@
 
 #include <ctype.h>
 //#include <winapifamily.h>
+#ifdef __GNUC__
 #include <msvctarget.h>
+#endif
 #include <specstrings.h>
 #include <kernelspecs.h>