diff options
| -rw-r--r-- | guththila/include/guththila_defines.h | 6 | ||||
| -rw-r--r-- | util/include/axutil_utils_defines.h | 15 |
2 files changed, 10 insertions, 11 deletions
diff --git a/guththila/include/guththila_defines.h b/guththila/include/guththila_defines.h index d297f55..5c7b9bc 100644 --- a/guththila/include/guththila_defines.h +++ b/guththila/include/guththila_defines.h @@ -31,10 +31,10 @@ #define GUTHTHILA_CALL #endif #else -#if defined(__unix) -#define GUTHTHILA_CALL -#else +#if defined(_WIN32) #define GUTHTHILA_CALL __stdcall +#else +#define GUTHTHILA_CALL #endif #endif diff --git a/util/include/axutil_utils_defines.h b/util/include/axutil_utils_defines.h index c12c842..7c975ef 100644 --- a/util/include/axutil_utils_defines.h +++ b/util/include/axutil_utils_defines.h @@ -119,26 +119,25 @@ extern "C" * Calling Conventions */ #if defined(__GNUC__) + #if defined(__i386) #define AXIS2_CALL __attribute__((cdecl)) #define AXIS2_WUR __attribute__((warn_unused_result)) #else #define AXIS2_CALL #define AXIS2_WUR +#endif +#elif defined(_WIN32) +#define AXIS2_CALL __stdcall +#define AXIS2_WUR -#endif -#else -#if defined(__unix) +#else /* Unix */ #define AXIS2_CALL #define AXIS2_WUR - -#else /* WIN32 */ -#define AXIS2_CALL __stdcall -#define AXIS2_WUR -#endif #endif + #define AXIS2_THREAD_FUNC AXIS2_CALL |