summaryrefslogtreecommitdiffstats
path: root/util/include
diff options
context:
space:
mode:
authorGravatar shankar2010-03-05 04:08:25 +0000
committerGravatar shankar2010-03-05 04:08:25 +0000
commitd2de56d2e5394cd7e8c501ad611795dbe6c0e573 (patch)
tree24a3af03668ec6275c2fc52d99068d403fd023ee /util/include
parentba7084a17ecb13d8f70e80d6f0827afd7cbf5f4f (diff)
downloadaxis2c-d2de56d2e5394cd7e8c501ad611795dbe6c0e573.tar.gz
axis2c-d2de56d2e5394cd7e8c501ad611795dbe6c0e573.tar.bz2
Fixing issue AXIS2C-1441
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@919281 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'util/include')
-rw-r--r--util/include/axutil_utils_defines.h15
1 files changed, 7 insertions, 8 deletions
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