X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fstream.h;h=8006dc5967deed7493a8bbeae25070f7beefa95c;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=ec0edf79bc52f80c96b8ec968ca92752d4250802;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/stream.h b/include/babeltrace2/trace-ir/stream.h
index ec0edf79..8006dc59 100644
--- a/include/babeltrace2/trace-ir/stream.h
+++ b/include/babeltrace2/trace-ir/stream.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_STREAM_H
-#define BABELTRACE_TRACE_IR_STREAM_H
+#ifndef BABELTRACE2_TRACE_IR_STREAM_H
+#define BABELTRACE2_TRACE_IR_STREAM_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@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_trace, bt_stream, bt_stream_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
@@ -64,6 +63,4 @@ extern bt_stream_set_name_status bt_stream_set_name(bt_stream *stream,
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
-#endif /* BABELTRACE_TRACE_IR_STREAM_H */
+#endif /* BABELTRACE2_TRACE_IR_STREAM_H */