X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-array.h;fp=src%2Fcommon%2Fdynamic-array.h;h=a370774049bd680df09ccc2716b0ba38e401be8b;hp=4ce2316f166ed04a91c835de01e116864922ad0f;hb=48a4000561343808724f7cb5fa8c131877489ccd;hpb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5

diff --git a/src/common/dynamic-array.h b/src/common/dynamic-array.h
index 4ce2316f1..a37077404 100644
--- a/src/common/dynamic-array.h
+++ b/src/common/dynamic-array.h
@@ -10,6 +10,10 @@
 
 #include <common/dynamic-buffer.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 typedef void (*lttng_dynamic_array_element_destructor)(void *element);
 typedef void (*lttng_dynamic_pointer_array_destructor)(void *ptr);
 
@@ -127,7 +131,7 @@ static inline
 void *lttng_dynamic_pointer_array_get_pointer(
 		const struct lttng_dynamic_pointer_array *array, size_t index)
 {
-	void **element = lttng_dynamic_array_get_element(&array->array, index);
+	void **element = (void **) lttng_dynamic_array_get_element(&array->array, index);
 
 	return *element;
 }
@@ -141,7 +145,7 @@ static inline
 void *lttng_dynamic_pointer_array_steal_pointer(
 		struct lttng_dynamic_pointer_array *array, size_t index)
 {
-	void **p_element = lttng_dynamic_array_get_element(&array->array, index);
+	void **p_element = (void **) lttng_dynamic_array_get_element(&array->array, index);
 	void *element = *p_element;
 
 	*p_element = NULL;
@@ -177,4 +181,8 @@ void lttng_dynamic_pointer_array_reset(
 void lttng_dynamic_pointer_array_clear(
 		struct lttng_dynamic_pointer_array *array);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* LTTNG_DYNAMIC_ARRAY_H */