X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=8cfdcbdb54057ee16813a432ac83e69ab6df12ef;hb=1ea2c2dfbd051d7ab86a2161b48aa8e4a2f2b5e2;hp=af15ad4efee84be05dcda5b76c4f53cdb6532771;hpb=9edd34bd25f52dd39b354a84f02697254121aefd;p=lttng-ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index af15ad4e..8cfdcbdb 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -31,7 +31,12 @@
 #include <bits/wordsize.h>
 #include <urcu/list.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ust_marker;
+struct ust_marker_probe_array;
 
 /**
  * ust_marker_probe_func - Type of a marker probe function
@@ -68,7 +73,7 @@ struct ust_marker {
 	uint16_t event_id;	/* Numeric event identifier, dynamic */
 	void (*call)(const struct ust_marker *mdata, void *call_private, ...);
 	struct ust_marker_probe_closure single;
-	struct ust_marker_probe_closure *multi;
+	struct ust_marker_probe_array *multi;
 	const char *tp_name;	/* Optional tracepoint name */
 	void *tp_cb;		/* Optional tracepoint callback */
 };
@@ -217,4 +222,8 @@ void __MARKER_LIB_IS_DEPRECATED()
  */
 #define MARK_NOARGS	UST_MARKER_NOARGS
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _UST_MARKER_H */