STDCALL and CDECL are now defined conditionally to be overridable

diff --git a/include/base.h b/include/base.h
index d57906e..cf59592 100644 (file)
--- a/include/base.h
+++ b/include/base.h
@@ -57,13 +57,21 @@ typedef long LONG;
 #define CONST const
 
 #ifdef i386
+#ifndef STDCALL
 #define STDCALL     __attribute__ ((stdcall))
+#endif
+#ifndef CDECL
 #define CDECL       __attribute((cdecl))
+#endif
 #define CALLBACK    WINAPI
 #define PASCAL      WINAPI
 #else
+#ifndef STDCALL
 #define STDCALL
+#endif
+#ifndef CDECL
 #define CDECL
+#endif
 #define CALLBACK
 #define PASCAL
 #endif

diff --git a/include/ntos/types.h b/include/ntos/types.h
index 1375aea..1395966 100644 (file)
--- a/include/ntos/types.h
+++ b/include/ntos/types.h
@@ -178,13 +178,21 @@ typedef struct _FILETIME
 #define CONST const
 
 #ifdef i386
+#ifndef STDCALL
 #define STDCALL     __attribute__ ((stdcall))
+#endif
+#ifndef CDECL
 #define CDECL       __attribute((cdecl))
+#endif
 #define CALLBACK    WINAPI
 #define PASCAL      WINAPI
 #else
+#ifndef STDCALL
 #define STDCALL
+#endif
+#ifndef CDECL
 #define CDECL
+#endif
 #define CALLBACK
 #define PASCAL
 #endif