misc: add c++ support to some headers

For now, just the headers required by our examples.

diff --git a/src/conf.h b/src/conf.h
index d05a7394a76c81f0b6f0b7e8165b7b9e0efad2d2..123afcb7cacce1c073ab69f6382d2694b10555fd 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -24,6 +24,11 @@
 #ifndef SURICATA_CONF_H
 #define SURICATA_CONF_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #include "queue.h"
 
 /**
@@ -105,4 +110,8 @@ SCConfNode *SCConfGetFirstNode(const SCConfNode *parent);
 SCConfNode *SCConfGetNextNode(const SCConfNode *node);
 const char *SCConfGetValueNode(const SCConfNode *node);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ! SURICATA_CONF_H */

diff --git a/src/suricata-common.h b/src/suricata-common.h
index b134586328dfb7c92bfce5ed0e0b455f3536e468..58a4ac4c43e3b10c9b74cc7a0f7cb215b862f79b 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -26,6 +26,11 @@
 #ifndef SURICATA_SURICATA_COMMON_H
 #define SURICATA_SURICATA_COMMON_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #ifdef DEBUG
 #define DBG_PERF
 #endif
@@ -556,4 +561,8 @@ extern int g_ut_covered;
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SURICATA_SURICATA_COMMON_H */

diff --git a/src/suricata.h b/src/suricata.h
index 093f58bd76d72124f98a96f91005c03dcaac7ec1..1b1a4b198c8ecd40074616c859de0de86f712f37 100644 (file)
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -64,6 +64,11 @@
 #ifndef SURICATA_SURICATA_H
 #define SURICATA_SURICATA_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #include "suricata-common.h"
 
 /* the name of our binary */
@@ -229,4 +234,8 @@ int WindowsInitService(int argc, char **argv);
 
 const char *GetProgramVersion(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SURICATA_SURICATA_H */

diff --git a/src/util-device.h b/src/util-device.h
index df4810aad1fbf735a1b58d6246d1ce0a1ecbd18c..e5569694e7049841e2a8a1b9cce7feef162f1935 100644 (file)
--- a/src/util-device.h
+++ b/src/util-device.h
@@ -18,6 +18,11 @@
 #ifndef SURICATA_UTIL_DEVICE_H
 #define SURICATA_UTIL_DEVICE_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #include "queue.h"
 #include "util-storage.h"
 #include "util-dpdk-common.h"
@@ -95,4 +100,8 @@ TmEcode LiveDeviceIfaceList(json_t *cmd, json_t *server_msg, void *data);
 TmEcode LiveDeviceGetBypassedStats(json_t *cmd, json_t *answer, void *data);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SURICATA_UTIL_DEVICE_H */