* Improve the way DDKAPI, DDKCDECLAPI and DDKFASTAPI are defined. With that we don't need ReactOS specific defines anymore.
* Already sent upstream.

svn path=/trunk/; revision=56882
This commit is contained in:
Amine Khaldi 2012-07-14 09:21:40 +00:00
parent 1cbd95e788
commit 2e6623a6fb

View file

@ -110,16 +110,17 @@
#define DEF_U64(x) (x##ULL) #define DEF_U64(x) (x##ULL)
#define DEF_I64(x) (x##LL) #define DEF_I64(x) (x##LL)
/* ReactOS-specific defines */ #ifndef DDKAPI
#ifdef USE_REACTOS_DDK #define DDKAPI __attribute__((stdcall))
#define DDKFASTAPI __attribute__((fastcall)) #endif
#else //USE_REACTOS_DDK
#define DDKAPI __attribute__((stdcall)) #ifndef DDKCDECLAPI
#define DDKFASTAPI __attribute__((fastcall)) #define DDKCDECLAPI __attribute__((cdecl))
#define DDKCDECLAPI __attribute__((cdecl)) #endif
#endif //DDKAPI #ifndef DDKFASTAPI
#define DDKFASTAPI __attribute__((fastcall))
#endif
#define DECLSPEC_NAKED __attribute__((naked)) #define DECLSPEC_NAKED __attribute__((naked))
@ -128,11 +129,17 @@
#define DEF_U64(x) (x##UI64) #define DEF_U64(x) (x##UI64)
#define DEF_I64(x) (x##I64) #define DEF_I64(x) (x##I64)
/* ReactOS-specific defines */ #ifndef DDKAPI
#define DDKAPI __stdcall
#endif
#define DDKAPI __stdcall #ifndef DDKCDECLAPI
#define DDKFASTAPI __fastcall #define DDKCDECLAPI _cdecl
#define DDKCDECLAPI _cdecl #endif
#ifndef DDKFASTAPI
#define DDKFASTAPI __fastcall
#endif
#define DECLSPEC_NAKED __declspec(naked) #define DECLSPEC_NAKED __declspec(naked)