Add lttng_ust_ prefix before objd_unref

[lttng-ust.git] / include / ust / tracepoint-event.h

diff --git a/include/ust/tracepoint-event.h b/include/ust/tracepoint-event.h
index 2d31f64d4a2201f0fbcdaf6d06958b288f233847..b4bd59cbaec3962cfea28c72d9c788b25b011d03 100644 (file)
--- a/include/ust/tracepoint-event.h
+++ b/include/ust/tracepoint-event.h
@@ -28,13 +28,19 @@
  *     TRACEPOINT_SYSTEM.h. This macro may be defined to tell
  *     define_trace.h what file to include.  Note, leave off the ".h".
  *
- * TRACEPOINT_INCLUDE_PATH if the path is something other than core
- *     kernel include/trace then this macro can define the path to use.
- *     Note, the path is relative to tracepoint_event.h, not the file
- *     including it. Full path names for out of tree modules must be
- *     used.
+ * TRACEPOINT_INCLUDE_PATH if the path is something other than within
+ *     the system's include/tracepoint/ path, then this macro can define
+ *     the path to use. This path is relative to tracepoint-event.h, or
+ *     to the include search path. Trick: Use a
+ *       #define TRACEPOINT_INCLUDE_PATH .
+ *     combined with -Ipath_to_header as compiler argument to allow
+ *     searching for a header within your project build tree.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef TRACEPOINT_CREATE_PROBES
 
 /* Prevent recursion */
@@ -84,9 +90,7 @@
 
 #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE)
 
-#ifndef CONFIG_NO_EVENT_TRACING
 #include <ust/lttng-tracepoint-event.h>
-#endif
 
 #undef TRACEPOINT_EVENT
 #undef TRACEPOINT_EVENT_CLASS
@@ -111,3 +115,7 @@
 #define TRACEPOINT_CREATE_PROBES
 
 #endif /* TRACEPOINT_CREATE_PROBES */
+
+#ifdef __cplusplus 
+}
+#endif