X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fusterr.h;h=fd5c80ae56475b40f46a067dc5be93010da5ad00;hb=7083f0fecaa692b819e63f484daf38399f58c905;hp=cab65407dca9c0c5740e038008b884d9480ac3d3;hpb=5e96a46756a5dcd6e348afd84078b9e26438245d;p=lttng-ust.git

diff --git a/include/usterr.h b/include/usterr.h
index cab65407..fd5c80ae 100644
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -27,9 +27,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <ust/core.h>
-
-#include "share.h"
+#include <lttng/core.h>
+#include "lttng/share.h"
 
 enum ust_loglevel {
 	UST_LOGLEVEL_UNKNOWN = 0,
@@ -64,7 +63,7 @@ static inline int ust_debug(void)
 			__func__);				\
 	} while(0)
 
-#ifdef UST_DEBUG
+#ifdef LTTNG_UST_DEBUG
 # define DBG(fmt, args...)		ERRMSG(fmt, ## args)
 # define DBG_raw(fmt, args...)					\
 	do {							\
@@ -107,12 +106,12 @@ static inline int ust_debug(void)
 
 #define BUG_ON(condition)					\
 	do {							\
-		if (unlikely(condition))			\
+		if (caa_unlikely(condition))			\
 			ERR("condition not respected (BUG) on line %s:%d", __FILE__, __LINE__);	\
 	} while(0)
 #define WARN_ON(condition)					\
 	do {							\
-		if (unlikely(condition))			\
+		if (caa_unlikely(condition))			\
 			WARN("condition not respected on line %s:%d", __FILE__, __LINE__); \
 	} while(0)
 #define WARN_ON_ONCE(condition) WARN_ON(condition)