[ros-diffs] [akhaldi] 56882: [UNIATA] * Improve the way DDKAPI, DDKCDECLAPI and DDKFASTAPI are defined. With that we don't need ReactOS specific defines anymore. * Already sent upstream.

Author: akhaldi
Date: Sat Jul 14 09:21:40 2012
New Revision: 56882

URL: http://svn.reactos.org/svn/reactos?rev=56882&view=rev
Log:
[UNIATA]
* Improve the way DDKAPI, DDKCDECLAPI and DDKFASTAPI are defined. With that we don't
need ReactOS specific defines anymore.
* Already sent upstream.

Modified:
    trunk/reactos/drivers/storage/ide/uniata/config.h

Modified: trunk/reactos/drivers/storage/ide/uniata/config.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] Sat Jul 14 09:21:40
2012
@@ -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)