From d2de56d2e5394cd7e8c501ad611795dbe6c0e573 Mon Sep 17 00:00:00 2001
From: shankar
Date: Fri, 5 Mar 2010 04:08:25 +0000
Subject: Fixing issue AXIS2C-1441

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@919281 13f79535-47bb-0310-9956-ffa450edef68
---
 guththila/include/guththila_defines.h |  6 +++---
 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
 
 
-- 
cgit v1.1-32-gdbae