X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fclock-class.h;h=556366f086884853a1ef1e4893566f7d2dc24327;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=cf03ca8025180750702cd996e3e12934a5bb24db;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/clock-class.h b/include/babeltrace2/trace-ir/clock-class.h
index cf03ca80..556366f0 100644
--- a/include/babeltrace2/trace-ir/clock-class.h
+++ b/include/babeltrace2/trace-ir/clock-class.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_CLOCK_CLASS_H
-#define BABELTRACE_TRACE_IR_CLOCK_CLASS_H
+#ifndef BABELTRACE2_TRACE_IR_CLOCK_CLASS_H
+#define BABELTRACE2_TRACE_IR_CLOCK_CLASS_H
 
 /*
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -27,16 +27,15 @@
  * http://www.efficios.com/ctf
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 
 /* For bt_bool, bt_uuid, bt_clock_class, bt_trace_class */
 #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
@@ -78,6 +77,4 @@ extern void bt_clock_class_set_uuid(bt_clock_class *clock_class,
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
-#endif /* BABELTRACE_TRACE_IR_CLOCK_CLASS_H */
+#endif /* BABELTRACE2_TRACE_IR_CLOCK_CLASS_H */