[ros-diffs] [hyperion] 38340: This is why we can't have nice things. Fixes r38338 build regression

Author: hyperion
Date: Wed Dec 24 17:31:09 2008
New Revision: 38340

URL: http://svn.reactos.org/svn/reactos?rev=38340&view=rev
Log:
This is why we can't have nice things. Fixes r38338 build regression

Modified:
    trunk/reactos/include/ddk/ntdef.h
    trunk/reactos/include/psdk/windef.h

Modified: trunk/reactos/include/ddk/ntdef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=383...
==============================================================================
--- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Wed Dec 24 17:31:09 2008
@@ -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,12 +225,14 @@
 #endif
 #endif

+#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

#if !defined(_M_CEE_PURE)
@@ -255,7 +257,7 @@

//
-// 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 @@
 // Void Pointers
 //
 typedef void *PVOID;
-//typedef void * POINTER_64 PVOID64; 
+//typedef void * POINTER_64 PVOID64;
 typedef PVOID PVOID64; // FIXME!

//

Modified: trunk/reactos/include/psdk/windef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=3...
==============================================================================
--- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Wed Dec 24 17:31:09 2008
@@ -141,7 +141,15 @@

#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