You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by sh...@apache.org on 2010/03/05 05:08:25 UTC
svn commit: r919281 - in /axis/axis2/c/core/trunk:
guththila/include/guththila_defines.h util/include/axutil_utils_defines.h
Author: shankar
Date: Fri Mar 5 04:08:25 2010
New Revision: 919281
URL: http://svn.apache.org/viewvc?rev=919281&view=rev
Log:
Fixing issue AXIS2C-1441
Modified:
axis/axis2/c/core/trunk/guththila/include/guththila_defines.h
axis/axis2/c/core/trunk/util/include/axutil_utils_defines.h
Modified: axis/axis2/c/core/trunk/guththila/include/guththila_defines.h
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/guththila/include/guththila_defines.h?rev=919281&r1=919280&r2=919281&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/guththila/include/guththila_defines.h (original)
+++ axis/axis2/c/core/trunk/guththila/include/guththila_defines.h Fri Mar 5 04:08:25 2010
@@ -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
Modified: axis/axis2/c/core/trunk/util/include/axutil_utils_defines.h
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/include/axutil_utils_defines.h?rev=919281&r1=919280&r2=919281&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/include/axutil_utils_defines.h (original)
+++ axis/axis2/c/core/trunk/util/include/axutil_utils_defines.h Fri Mar 5 04:08:25 2010
@@ -119,26 +119,25 @@
* 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