X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Ftrace-const.h;h=db06dcba30fb2fd8dcc79c0e20940b36461a76b5;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=88ae1ecd7c82147190d4133b23d3e6bbb94a392e;hpb=335a2da576e59d32c17de2ece1e7e339c50e9c25;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/trace-const.h b/include/babeltrace2/trace-ir/trace-const.h
index 88ae1ecd..db06dcba 100644
--- a/include/babeltrace2/trace-ir/trace-const.h
+++ b/include/babeltrace2/trace-ir/trace-const.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_TRACE_CONST_H
-#define BABELTRACE_TRACE_IR_TRACE_CONST_H
+#ifndef BABELTRACE2_TRACE_IR_TRACE_CONST_H
+#define BABELTRACE2_TRACE_IR_TRACE_CONST_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -27,6 +27,10 @@
  * http://www.efficios.com/ctf
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 
 /*
@@ -35,11 +39,6 @@
  */
 #include <babeltrace2/types.h>
 
-/* For __BT_FUNC_STATUS_* */
-#define __BT_FUNC_STATUS_ENABLE
-#include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -110,6 +109,4 @@ extern void bt_trace_put_ref(const bt_trace *trace);
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
-#endif /* BABELTRACE_TRACE_IR_TRACE_CONST_H */
+#endif /* BABELTRACE2_TRACE_IR_TRACE_CONST_H */