From 2e6623a6fba8600a165d8a69eb2fab050e98144e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 14 Jul 2012 09:21:40 +0000 Subject: [PATCH] [UNIATA] * 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 --- reactos/drivers/storage/ide/uniata/config.h | 31 +++++++++++++-------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/reactos/drivers/storage/ide/uniata/config.h b/reactos/drivers/storage/ide/uniata/config.h index 690acd4b0cd..cf75739ddc0 100644 --- a/reactos/drivers/storage/ide/uniata/config.h +++ b/reactos/drivers/storage/ide/uniata/config.h @@ -110,16 +110,17 @@ #define DEF_U64(x) (x##ULL) #define DEF_I64(x) (x##LL) - /* ReactOS-specific defines */ - #ifdef USE_REACTOS_DDK - #define DDKFASTAPI __attribute__((fastcall)) - #else //USE_REACTOS_DDK + #ifndef DDKAPI + #define DDKAPI __attribute__((stdcall)) + #endif - #define DDKAPI __attribute__((stdcall)) - #define DDKFASTAPI __attribute__((fastcall)) - #define DDKCDECLAPI __attribute__((cdecl)) + #ifndef DDKCDECLAPI + #define DDKCDECLAPI __attribute__((cdecl)) + #endif - #endif //DDKAPI + #ifndef DDKFASTAPI + #define DDKFASTAPI __attribute__((fastcall)) + #endif #define DECLSPEC_NAKED __attribute__((naked)) @@ -128,11 +129,17 @@ #define DEF_U64(x) (x##UI64) #define DEF_I64(x) (x##I64) - /* ReactOS-specific defines */ + #ifndef DDKAPI + #define DDKAPI __stdcall + #endif - #define DDKAPI __stdcall - #define DDKFASTAPI __fastcall - #define DDKCDECLAPI _cdecl + #ifndef DDKCDECLAPI + #define DDKCDECLAPI _cdecl + #endif + + #ifndef DDKFASTAPI + #define DDKFASTAPI __fastcall + #endif #define DECLSPEC_NAKED __declspec(naked)