X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Ftrace.h;h=c759ca63f545b343cbe7a1552768471ffda21054;hp=5712867092d6164f5daf3b26600f56fb16a18f03;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hpb=15caa1ca4fac30bd196602bd136e48fda3892de2

diff --git a/include/babeltrace2/trace-ir/trace.h b/include/babeltrace2/trace-ir/trace.h
index 57128670..c759ca63 100644
--- a/include/babeltrace2/trace-ir/trace.h
+++ b/include/babeltrace2/trace-ir/trace.h
@@ -27,13 +27,15 @@
  * http://www.efficios.com/ctf
  */
 
+#include <stdint.h>
+
 /* For bt_bool, bt_trace, bt_trace_class, bt_stream */
 #include <babeltrace2/types.h>
 
-/* For bt_trace_status */
-#include <babeltrace2/trace-ir/trace-const.h>
-
-#include <stdint.h>
+/* For __BT_FUNC_STATUS_* */
+#define __BT_FUNC_STATUS_ENABLE
+#include <babeltrace2/func-status.h>
+#undef __BT_FUNC_STATUS_ENABLE
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,7 +45,12 @@ extern bt_trace_class *bt_trace_borrow_class(bt_trace *trace);
 
 extern bt_trace *bt_trace_create(bt_trace_class *trace_class);
 
-extern bt_trace_status bt_trace_set_name(bt_trace *trace,
+typedef enum bt_trace_set_name_status {
+	BT_TRACE_SET_NAME_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_TRACE_SET_NAME_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_trace_set_name_status;
+
+extern bt_trace_set_name_status bt_trace_set_name(bt_trace *trace,
 		const char *name);
 
 extern bt_stream *bt_trace_borrow_stream_by_index(bt_trace *trace,
@@ -56,4 +63,6 @@ extern bt_stream *bt_trace_borrow_stream_by_id(bt_trace *trace,
 }
 #endif
 
+#include <babeltrace2/undef-func-status.h>
+
 #endif /* BABELTRACE_TRACE_IR_TRACE_H */