Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=38340
This commit is contained in:
KJK::Hyperion 2008-12-24 23:31:09 +00:00
parent 456b1c9e58
commit e4fdb61e4c
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/include/ddk/ntdef.h
View file

@ -11,7 +11,7 @@
// FIXME: Should we include these here? // FIXME: Should we include these here?
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
typedef unsigned long POINTER_64; // FIXME! HACK!!! typedef unsigned long POINTER_64; // FIXME! HACK!!!
@ -225,6 +225,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
#endif #endif
#endif #endif
#ifndef DECLSPEC_NOINLINE
#if (_MSC_VER >= 1300) #if (_MSC_VER >= 1300)
#define DECLSPEC_NOINLINE __declspec(noinline) #define DECLSPEC_NOINLINE __declspec(noinline)
#elif defined(__GNUC__) #elif defined(__GNUC__)
@ -232,6 +233,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
#else #else
#define DECLSPEC_NOINLINE #define DECLSPEC_NOINLINE
#endif #endif
#endif
#if !defined(_M_CEE_PURE) #if !defined(_M_CEE_PURE)
#define NTAPI_INLINE NTAPI #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_PARAMETER(P) {(P)=(P);}
#define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} #define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);}
@ -290,7 +292,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
// Void Pointers // Void Pointers
// //
typedef void *PVOID; typedef void *PVOID;
//typedef void * POINTER_64 PVOID64; //typedef void * POINTER_64 PVOID64;
typedef PVOID PVOID64; // FIXME! typedef PVOID PVOID64; // FIXME!
// //

10
reactos/include/psdk/windef.h
View file

@ -141,7 +141,15 @@ extern "C" {
#define DECLSPEC_IMPORT __declspec(dllimport) #define DECLSPEC_IMPORT __declspec(dllimport)
#define DECLSPEC_EXPORT __declspec(dllexport) #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__ #ifdef __GNUC__
#define DECLSPEC_NORETURN __declspec(noreturn) #define DECLSPEC_NORETURN __declspec(noreturn)
#define DECLARE_STDCALL_P( type ) __stdcall type #define DECLARE_STDCALL_P( type ) __stdcall type