X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-pthread-wrapper%2Fust_pthread.h;h=c17ba4abe774e2feaae85fc7c7aacb50c6f97758;hb=5b393d6424d959e2efbb800b0c8a61b81bf9968e;hp=d22eab2e0555ea1d3ceaac1b84bf8d8eb912dad5;hpb=efa14d169c6336fa8b9f478538ac7968ef9c0338;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
index d22eab2e..c17ba4ab 100644
--- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
+++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
@@ -4,10 +4,10 @@
  * Copyright (C) 2013  Mentor Graphics
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_ust_pthread
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_pthread
 
-#if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_PTHREAD_H
 
 #ifdef __cplusplus
@@ -16,7 +16,7 @@ extern "C" {
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, void *, ip),
 	LTTNG_UST_TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
@@ -24,7 +24,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_req,
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	LTTNG_UST_TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
@@ -33,7 +33,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_lock_acq,
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	LTTNG_UST_TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
@@ -42,7 +42,7 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_trylock,
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
 	LTTNG_UST_TP_ARGS(pthread_mutex_t *, mutex, int, status, void *, ip),
 	LTTNG_UST_TP_FIELDS(
 		ctf_integer_hex(void *, mutex, mutex)
@@ -53,8 +53,8 @@ TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
 
 #endif /* _TRACEPOINT_UST_PTHREAD_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_pthread.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_pthread.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>