Allow CPP linkage by adding extern "C" {} to external header files.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2148 fd59a12c-fef9-0310-b244-a6a79926bd2f

diff --git a/include/corosync/confdb.h b/include/corosync/confdb.h
index 8693048de59e8aa65fa62f75b33cb89887a05417..e0797bb3bf57fa9796e6d30b0d3dccc9ef25960b 100644 (file)
--- a/include/corosync/confdb.h
+++ b/include/corosync/confdb.h
@@ -37,6 +37,10 @@
 #include <corosync/corotypes.h>
 #include <corosync/hdb.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup confdb_corosync
  *
@@ -283,4 +287,8 @@ cs_error_t confdb_context_set (
        confdb_handle_t handle,
        const void *context);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COROSYNC_CONFDB_H_DEFINED */

diff --git a/include/corosync/coroipcc.h b/include/corosync/coroipcc.h
index 195f4899e83ea1a35246a8961ccfb01964dcba11..4fa42cd5828f85a8e8504fa621d05023fd75ad78 100644 (file)
--- a/include/corosync/coroipcc.h
+++ b/include/corosync/coroipcc.h
@@ -41,6 +41,10 @@
 #include <sys/socket.h>
 #include <corosync/corotypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern cs_error_t
 coroipcc_service_connect (
        const char *socket_name,
@@ -106,4 +110,9 @@ coroipcc_zcb_msg_send_reply_receive (
        void *res_msg,
        size_t res_len);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COROIPCC_H_DEFINED */

diff --git a/include/corosync/coroipcs.h b/include/corosync/coroipcs.h
index a7e648eb3652da6e7ea0a2b7aa319c85525b2ab8..e3f5cef234169e5b7059c45f380cc2efd836aaf8 100644 (file)
--- a/include/corosync/coroipcs.h
+++ b/include/corosync/coroipcs.h
@@ -37,6 +37,10 @@
 
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct iovec;
 
 typedef int (*coroipcs_init_fn_lvalue) (void *conn);
@@ -110,4 +114,8 @@ extern int coroipcs_handler_dispatch (
        int revent,
        void *context);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COROIPCS_H_DEFINED */

diff --git a/include/corosync/cpg.h b/include/corosync/cpg.h
index 9130dbb275f3524c32ad6c22212857f529f3352b..30e4b7916a9b52f393efd30074ebf4653813fd6b 100644 (file)
--- a/include/corosync/cpg.h
+++ b/include/corosync/cpg.h
@@ -37,6 +37,10 @@
 #include <netinet/in.h>
 #include <corosync/corotypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup cpg_corosync
  *
@@ -201,4 +205,8 @@ cs_error_t cpg_zcb_mcast_joined (
        void *msg,
        size_t msg_len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COROSYNC_CPG_H_DEFINED */

diff --git a/include/corosync/engine/logsys.h b/include/corosync/engine/logsys.h
index dc84f1b8c32f677ec28be33d9323807d31bdafe6..90919f2e8d76ad3a2a736ed3f9b526ebde935190 100644 (file)
--- a/include/corosync/engine/logsys.h
+++ b/include/corosync/engine/logsys.h
@@ -42,6 +42,10 @@
 #include <syslog.h>
 #include <pthread.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * All of the LOGSYS_MODE's can be ORed together for combined behavior
  *
@@ -370,4 +374,8 @@ do {                                                                        \
                __FILE__,  __LINE__, LOGSYS_TAG_TRACE8, format, ##args);\
 } while(0)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LOGSYS_H_DEFINED */

diff --git a/include/corosync/evs.h b/include/corosync/evs.h
index 31113efcf091e0e64f9c4c7eea8e287f5191bd93..a19004be9e020d6d3e5d1880ae1f2f3e456fe3ec 100644 (file)
--- a/include/corosync/evs.h
+++ b/include/corosync/evs.h
@@ -37,6 +37,10 @@
 #include <netinet/in.h>
 #include <corosync/corotypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup corosync Other API services provided by corosync
  */
@@ -165,4 +169,8 @@ cs_error_t evs_membership_get (
        unsigned int *member_list,
        size_t *member_list_entries);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COROSYNC_EVS_H_DEFINED */

diff --git a/include/corosync/lcr/lcr_ifact.h b/include/corosync/lcr/lcr_ifact.h
index 4ae59c6e8d13b0a1e1f39b2b20b51bf17d39d466..0be3e3704e18e8cf2e1dc2b0215f8db9d6d4eb35 100644 (file)
--- a/include/corosync/lcr/lcr_ifact.h
+++ b/include/corosync/lcr/lcr_ifact.h
@@ -33,6 +33,10 @@
 
 #include <corosync/hdb.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int lcr_ifact_reference (
        hdb_handle_t *handle,
        const char *iface_name,
@@ -43,4 +47,9 @@ int lcr_ifact_reference (
 int lcr_ifact_release (
        hdb_handle_t handle);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LCR_IFACT_H_DEFINED */

diff --git a/include/corosync/pload.h b/include/corosync/pload.h
index 3e34b54a12dd4e708611f8b333ef4e4d803a9c34..ff9bcecce74796b2474cf99ed695fa75397a4c68 100644 (file)
--- a/include/corosync/pload.h
+++ b/include/corosync/pload.h
@@ -37,6 +37,10 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup corosync Other API services provided by corosync
  */
@@ -97,4 +101,9 @@ unsigned int pload_start (
         unsigned int msg_count,
         unsigned int msg_size);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COROSYNC_PLOAD_H_DEFINED */

diff --git a/include/corosync/quorum.h b/include/corosync/quorum.h
index 39690c196fdd8e0c23fdac620ac1d03902fd3606..ab5333b7d9b024942b52f591388441879b75935a 100644 (file)
--- a/include/corosync/quorum.h
+++ b/include/corosync/quorum.h
@@ -36,6 +36,10 @@
 
 #include <corosync/corotypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef uint64_t quorum_handle_t;
 
 typedef struct {
@@ -109,4 +113,8 @@ cs_error_t quorum_context_get (
        quorum_handle_t handle,
        const void **context);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* COROSYNC_QUORUM_H_DEFINED */

diff --git a/include/corosync/totem/coropoll.h b/include/corosync/totem/coropoll.h
index c095e404f6c28909bfa991b676751f375bd60bb1..16e1b8a48b415be41ae4f6548ef8a29e9f31c9e9 100644 (file)
--- a/include/corosync/totem/coropoll.h
+++ b/include/corosync/totem/coropoll.h
@@ -37,6 +37,10 @@
 #include <corosync/hdb.h>
 #include <pthread.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void * poll_timer_handle;
 
 hdb_handle_t poll_create (void);
@@ -85,9 +89,8 @@ int poll_run (
 int poll_stop (
        hdb_handle_t handle);
 
-#ifdef COMPILE_OUT
-void poll_print_state (
-       hdb_handle_t handle, int fd);
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* POLL_H_DEFINED */

diff --git a/include/corosync/totem/totemip.h b/include/corosync/totem/totemip.h
index efc8e8350c2292189084a83a6983e291feb3b7af..9f45b5f96b9885d073a91353dc8cb3d9aafebdf7 100644 (file)
--- a/include/corosync/totem/totemip.h
+++ b/include/corosync/totem/totemip.h
@@ -40,6 +40,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef SO_NOSIGPIPE
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
@@ -93,4 +97,8 @@ static inline int totemip_zero_check(const struct totem_ip_address *addr)
        return (addr->family == 0);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/include/corosync/totem/totempg.h b/include/corosync/totem/totempg.h
index d693b84ca730ba6a21439f55208ab316fb283ebe..a5a2a2bcd28d9986935c0b10fc5309aabaedbd81 100644 (file)
--- a/include/corosync/totem/totempg.h
+++ b/include/corosync/totem/totempg.h
@@ -36,6 +36,10 @@
 #ifndef TOTEMPG_H_DEFINED
 #define TOTEMPG_H_DEFINED
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <netinet/in.h>
 #include "totem.h"
 #include "coropoll.h"
@@ -149,4 +153,8 @@ extern int totempg_crypto_set (unsigned int type);
 
 extern int totempg_ring_reenable (void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* TOTEMPG_H_DEFINED */

diff --git a/include/corosync/votequorum.h b/include/corosync/votequorum.h
index bc05808730752050d03dcd46d85d1d87024795d6..31b60c56476fd7197d6e860d263ebfe530422e3b 100644 (file)
--- a/include/corosync/votequorum.h
+++ b/include/corosync/votequorum.h
@@ -35,8 +35,11 @@
 #ifndef COROSYNC_VOTEQUORUM_H_DEFINED
 #define COROSYNC_VOTEQUORUM_H_DEFINED
 
-typedef uint64_t votequorum_handle_t;
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+typedef uint64_t votequorum_handle_t;
 
 #define VOTEQUORUM_MAX_QDISK_NAME_LEN 255
 
@@ -209,4 +212,7 @@ cs_error_t votequorum_context_set (
        votequorum_handle_t handle,
        void *context);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* COROSYNC_VOTEQUORUM_H_DEFINED */