You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by du...@apache.org on 2008/08/12 11:11:45 UTC
svn commit: r685100 - in /webservices/axis2/trunk/c/util/include/platforms:
axutil_platform_auto_sense.h windows/axutil_windows.h
Author: dushshantha
Date: Tue Aug 12 02:11:44 2008
New Revision: 685100
URL: http://svn.apache.org/viewvc?rev=685100&view=rev
Log:
Moved #includes out of the extern "C" block to avoid breaking C++ applications.
Modified:
webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h
webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
Modified: webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h?rev=685100&r1=685099&r2=685100&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/axutil_platform_auto_sense.h Tue Aug 12 02:11:44 2008
@@ -24,10 +24,12 @@
* @brief axis2 platform auto sense
*/
+/*
#ifdef __cplusplus
extern "C"
{
#endif
+*/
/** @defgroup axis2_platform_auto_sense
* @ingroup axis2_platforms
@@ -52,8 +54,10 @@
#endif
/** @} */
+/*
#ifdef __cplusplus
}
#endif
+*/
-#endif /* AXIS2_PLATFORM_AUTOSENSE_H */
+#endif /* AXIS2_PLATFORM_AUTOSENSE_H */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h?rev=685100&r1=685099&r2=685100&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h Tue Aug 12 02:11:44 2008
@@ -24,23 +24,6 @@
* @brief axis2 unix platform specific interface
*/
#include <axutil_utils_defines.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
- /** @defgroup axis2_unix Platform Specific
- * @ingroup axis2_platforms_unix
- * @{
- */
-
- /*enum platform_error_codes
- {
- PLATFORM_ERROR_UUID_NO_ADDRESS = 0,
- PLATFORM_ERROR_OUT_OF_MEMORY = 1
- }; */
-
#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
#include <windows.h>
@@ -56,6 +39,7 @@
#include <fcntl.h>
#include <Mswsock.h>
#include <Ws2tcpip.h>
+
/* for time */
#include <time.h>
#include <sys/timeb.h>
@@ -63,6 +47,24 @@
/* get opt */
#include "axutil_getopt_windows.h"
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+ /** @defgroup axis2_unix Platform Specific
+ * @ingroup axis2_platforms_unix
+ * @{
+ */
+
+ /*enum platform_error_codes
+ {
+ PLATFORM_ERROR_UUID_NO_ADDRESS = 0,
+ PLATFORM_ERROR_OUT_OF_MEMORY = 1
+ }; */
+
+
+
AXIS2_EXTERN HMODULE AXIS2_CALL
callLoadLib(
char *lib);