cpp support

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@32 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Library/W3Core.h b/Library/W3Core.h
index d7033e65c81e64176904aef29591649d2663d192..bc103afaeb8a22c8de1e87a6f143086bc6571f62 100644 (file)
--- a/Library/W3Core.h
+++ b/Library/W3Core.h
@@ -2,6 +2,10 @@
 #ifndef __W3CORE_H__
 #define __W3CORE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdbool.h>
 
 #include "W3Version.h"
@@ -28,4 +32,8 @@ void W3_Send_Request(struct W3* w3);                                          /* Send the request */
 void W3_Set_Header(struct W3* w3, const char* key, const char* value);         /* Set the header */
 void W3_Free(struct W3* w3);                                                   /* Free the struct */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/Library/W3DNS.h b/Library/W3DNS.h
index c34852a48e8f331c2200bf34807dd24b0f381ac4..e53e2ee57835367d62cef5a1f1c80be0fd6bc0e3 100644 (file)
--- a/Library/W3DNS.h
+++ b/Library/W3DNS.h
@@ -2,6 +2,10 @@
 #ifndef __W3DNS_H__
 #define __W3DNS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -13,4 +17,8 @@ int __W3_DNS_Connect(const char* hostname, bool ssl, uint16_t port
 #endif
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/Library/W3HTTP.h b/Library/W3HTTP.h
index 33e655a2225c0ce09deaf6f1f10e608dc6f05672..2000259032acd352a54eb6dc39f510564eea9511 100644 (file)
--- a/Library/W3HTTP.h
+++ b/Library/W3HTTP.h
@@ -2,7 +2,15 @@
 #ifndef __W3HTTP_H__
 #define __W3HTTP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "W3Core.h"
 void __W3_HTTP_Request(struct W3* w3);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/Library/W3Util.h b/Library/W3Util.h
index b03f55c28fd95ac99c2b33d3fbb753192e8415d9..6fb36a32858356a453a62c08503cda904ea8ef54 100644 (file)
--- a/Library/W3Util.h
+++ b/Library/W3Util.h
@@ -2,6 +2,10 @@
 #ifndef __W3UTIL_H__
 #define __W3UTIL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "W3Core.h"
 
 #include <stdbool.h>
@@ -15,4 +19,8 @@ unsigned long __W3_Auto_Read(struct W3* w3, char* data, unsigned long length);
 bool __W3_Have_Header(struct W3* w3, const char* name);
 char* __W3_Get_Platform(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/Makefile b/Makefile
index b6318118bae327efcb76198098454c46632449c8..69e65a54e6d2e4ae25db99a0adf5345c28017051 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ endif
        echo "Libs: -I\$${libdir} -lw3" >> $@
 
 clean:
-       -rm ./w3.pc *.zip *.tar.gz ./Library/W3Version.h
+       -rm ./w3.pc w3-*.zip w3-*.tar.gz w3-*.lzh ./Library/W3Version.h
        $(MAKE) -C ./Library clean
        $(MAKE) -C ./Example clean
 

diff --git a/W3Version.h.p b/W3Version.h.p
index 8cb59a03620427ca686e014266aed1695e1b6cf4..31e674fbb5b28b57e2ec2c0ee0407229e7302a6c 100644 (file)
--- a/W3Version.h.p
+++ b/W3Version.h.p
@@ -2,7 +2,15 @@
 #ifndef __W3VERSION_H__
 #define __W3VERSION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define LIBW3_VERSION "0.0" \
 SUFFIX
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif