This is why we can't have nice things. Fixes r38338 build regression

svn path=/trunk/; revision=38340

diff --git a/reactos/include/ddk/ntdef.h b/reactos/include/ddk/ntdef.h
index cfd85b7..303e6e5 100644 (file)
--- a/reactos/include/ddk/ntdef.h
+++ b/reactos/include/ddk/ntdef.h
@@ -11,7 +11,7 @@
 
 // FIXME: Should we include these here?
 #include <stdarg.h>
-#include <string.h> 
+#include <string.h>
 
 
 typedef unsigned long POINTER_64; // FIXME! HACK!!!
@@ -225,6 +225,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
 #endif
 #endif
 
+#ifndef DECLSPEC_NOINLINE
 #if (_MSC_VER >= 1300)
 #define DECLSPEC_NOINLINE  __declspec(noinline)
 #elif defined(__GNUC__)
@@ -232,6 +233,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
 #else
 #define DECLSPEC_NOINLINE
 #endif
+#endif
 
 #if !defined(_M_CEE_PURE)
 #define NTAPI_INLINE    NTAPI
@@ -255,7 +257,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
 
 
 //
-// Use to silence unused variable warnings when it is intentional 
+// Use to silence unused variable warnings when it is intentional
 //
 #define UNREFERENCED_PARAMETER(P) {(P)=(P);}
 #define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);}
@@ -290,7 +292,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
 // Void Pointers
 //
 typedef void *PVOID;
-//typedef void * POINTER_64 PVOID64; 
+//typedef void * POINTER_64 PVOID64;
 typedef PVOID PVOID64; // FIXME!
 
 //

diff --git a/reactos/include/psdk/windef.h b/reactos/include/psdk/windef.h
index 9ebe5a3..72d9436 100644 (file)
--- a/reactos/include/psdk/windef.h
+++ b/reactos/include/psdk/windef.h
@@ -141,7 +141,15 @@ extern "C" {
 
 #define DECLSPEC_IMPORT __declspec(dllimport)
 #define DECLSPEC_EXPORT __declspec(dllexport)
-#define DECLSPEC_NOINLINE __declspec(noinline)
+#ifndef DECLSPEC_NOINLINE
+#if (_MSC_VER >= 1300)
+#define DECLSPEC_NOINLINE  __declspec(noinline)
+#elif defined(__GNUC__)
+#define DECLSPEC_NOINLINE __attribute__((noinline))
+#else
+#define DECLSPEC_NOINLINE
+#endif
+#endif
 #ifdef __GNUC__
 #define DECLSPEC_NORETURN __declspec(noreturn)
 #define DECLARE_STDCALL_P( type ) __stdcall type