Fix: C++ support to API header files

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/babeltrace/clock-types.h b/include/babeltrace/clock-types.h
index 438d335f7a3ecf196fc27a815f9d628a20fae91d..e1fbfb7d405ca38d95a8536a7038137e6b29f2db 100644 (file)
--- a/include/babeltrace/clock-types.h
+++ b/include/babeltrace/clock-types.h
@@ -22,6 +22,10 @@
  * all copies or substantial portions of the Software.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * The Babeltrace clock representations
  */
@@ -30,4 +34,8 @@ enum bt_clock_type {
        BT_CLOCK_REAL,
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BABELTRACE_CLOCK_TYPES_H */

diff --git a/include/babeltrace/context.h b/include/babeltrace/context.h
index ee2a724aaebdb43903758e7e9e091613496ff738..bc7de3a0e84c5de89967cae08cc020d7e18145ac 100644 (file)
--- a/include/babeltrace/context.h
+++ b/include/babeltrace/context.h
@@ -26,6 +26,10 @@
 #include <unistd.h>
 #include <babeltrace/format.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* struct bt_context is opaque to the user */
 struct bt_context;
 struct stream_pos;
@@ -105,4 +109,8 @@ void bt_context_put(struct bt_context *ctx);
  */
 struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *event);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BABELTRACE_CONTEXT_H */

diff --git a/include/babeltrace/ctf/callbacks.h b/include/babeltrace/ctf/callbacks.h
index 597d4b17c00479d2e48d2d510bcd9424facc90ea..128d597b0c87b22f5e11656cb76607ddb9ab7a0c 100644 (file)
--- a/include/babeltrace/ctf/callbacks.h
+++ b/include/babeltrace/ctf/callbacks.h
@@ -25,6 +25,10 @@
 
 #include <babeltrace/format.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Forward declarations */
 struct bt_ctf_iter;
 struct bt_dependencies;
@@ -97,4 +101,8 @@ enum {
        BT_FLAGS_FREE_PRIVATE_DATA      = (1 << 0),
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*_BABELTRACE_CTF_CALLBACKS_H */

diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h
index c34ae9a4f549328dbbb095fb8e392e40f25a396e..bbb9d9a558ca5d52db53562c86cfbd579c07464a 100644 (file)
--- a/include/babeltrace/ctf/events.h
+++ b/include/babeltrace/ctf/events.h
@@ -27,6 +27,10 @@
 #include <babeltrace/context.h>
 #include <babeltrace/clock-types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct definition;
 struct bt_ctf_event;
 struct bt_ctf_event_decl;
@@ -243,4 +247,8 @@ int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl,
  */
 const char *bt_ctf_get_decl_field_name(const struct bt_ctf_field_decl *field);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BABELTRACE_CTF_EVENTS_H */

diff --git a/include/babeltrace/ctf/iterator.h b/include/babeltrace/ctf/iterator.h
index fe70b5e732258e5a245e151a7a259eb7eaf237f8..9370583a58df3e6042b92f74932305234ba0bc51 100644 (file)
--- a/include/babeltrace/ctf/iterator.h
+++ b/include/babeltrace/ctf/iterator.h
@@ -25,6 +25,10 @@
 
 #include <babeltrace/iterator.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct bt_ctf_iter;
 struct bt_ctf_event;
 
@@ -70,4 +74,8 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter);
  */
 struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BABELTRACE_CTF_ITERATOR_H */

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 4ace0b04563067a56187063299a3bc3679995a93..ef340da115b9432abdad0f35d6e5e94a3d23e52b 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -26,6 +26,10 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int bt_intern_str;
 
 /* forward declaration */
@@ -75,5 +79,8 @@ extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct format *format);
 
 /* TBD: format unregistration */
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _BABELTRACE_FORMAT_H */

diff --git a/include/babeltrace/iterator.h b/include/babeltrace/iterator.h
index 22dabb479048e75007a30a40d1cc62e83e0687d9..3f7984fbe66ea00c01e6e5c95090acbf07f634fc 100644 (file)
--- a/include/babeltrace/iterator.h
+++ b/include/babeltrace/iterator.h
@@ -20,6 +20,10 @@
 #include <babeltrace/format.h>
 #include <babeltrace/context.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Forward declarations */
 struct bt_iter;
 struct bt_saved_pos;
@@ -106,4 +110,8 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *pos);
 struct bt_iter_pos *bt_iter_create_time_pos(struct bt_iter *iter,
                uint64_t timestamp);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BABELTRACE_ITERATOR_H */

diff --git a/include/babeltrace/list.h b/include/babeltrace/list.h
index 43a821671d89ab9fe41dc35d5623017d3129d598..ee5d84bd8dc55dcb55f93af31afc29f5f067b01b 100644 (file)
--- a/include/babeltrace/list.h
+++ b/include/babeltrace/list.h
@@ -25,6 +25,9 @@
    found in the Linux kernel headers to enable people familiar with
    the latter find their way in these sources as well.  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* Basic type for the double-link list.  */
 struct bt_list_head
@@ -168,4 +171,8 @@ static inline void bt_list_replace_init(struct bt_list_head *old,
        BT_INIT_LIST_HEAD(old);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BT_LIST_H */

diff --git a/include/babeltrace/trace-collection.h b/include/babeltrace/trace-collection.h
index bf68d4e69ebfcacacc916d7ae9e03b706e5e53ff..0542d03c044ca6e0daddf41de30ce6cf2830437f 100644 (file)
--- a/include/babeltrace/trace-collection.h
+++ b/include/babeltrace/trace-collection.h
@@ -21,6 +21,10 @@
  * all copies or substantial portions of the Software.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct trace_collection;
 
 void init_trace_collection(struct trace_collection *tc);
@@ -30,4 +34,8 @@ int trace_collection_add(struct trace_collection *tc,
 int trace_collection_remove(struct trace_collection *tc,
                         struct trace_descriptor *td);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BABELTRACE_TRACE_COLLECTION_H */

diff --git a/include/babeltrace/trace-handle.h b/include/babeltrace/trace-handle.h
index f0e23125d1a86511bfc3e9b3efba015702c31ead..426800d84e4cf1d01056b6310233bf1eefd2ad92 100644 (file)
--- a/include/babeltrace/trace-handle.h
+++ b/include/babeltrace/trace-handle.h
@@ -25,6 +25,10 @@
 #include <stdint.h>
 #include <babeltrace/clock-types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * trace_handle : unique identifier of a trace
  *
@@ -63,4 +67,8 @@ uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
  */
 int bt_ctf_event_get_handle_id(const struct bt_ctf_event *event);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BABELTRACE_TRACE_HANDLE_H */