X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fcurrent-thread.h;h=125db20e1e1af00ce7f9695fd411577488975fdd;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=e89d052115e3c5553a141a3a719eecf98fa71bb2;hpb=553c4bab3cad8ad569c14a01b39a66a2d8bcde7c;p=babeltrace.git

diff --git a/include/babeltrace2/current-thread.h b/include/babeltrace2/current-thread.h
index e89d0521..125db20e 100644
--- a/include/babeltrace2/current-thread.h
+++ b/include/babeltrace2/current-thread.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_CURRENT_THREAD_H
-#define BABELTRACE_CURRENT_THREAD_H
+#ifndef BABELTRACE2_CURRENT_THREAD_H
+#define BABELTRACE2_CURRENT_THREAD_H
 
 /*
  * Copyright (c) 2019 Philippe Proulx <pproulx@efficios.com>
@@ -23,6 +23,10 @@
  * SOFTWARE.
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdarg.h>
 
 /*
@@ -31,11 +35,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
@@ -98,6 +97,4 @@ bt_current_thread_error_append_cause_from_message_iterator(
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
-#endif /* BABELTRACE_CURRENT_THREAD_H */
+#endif /* BABELTRACE2_CURRENT_THREAD_H */