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

diff --git a/include/babeltrace2/trace-ir/stream.h b/include/babeltrace2/trace-ir/stream.h
index dbf9eff7..ec0edf79 100644
--- a/include/babeltrace2/trace-ir/stream.h
+++ b/include/babeltrace2/trace-ir/stream.h
@@ -27,13 +27,15 @@
  * http://www.efficios.com/ctf
  */
 
+#include <stdint.h>
+
 /* For bt_trace, bt_stream, bt_stream_class */
 #include <babeltrace2/types.h>
 
-/* For bt_stream_status */
-#include <babeltrace2/trace-ir/stream-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" {
@@ -50,11 +52,18 @@ extern bt_trace *bt_stream_borrow_trace(bt_stream *stream);
 
 extern bt_stream_class *bt_stream_borrow_class(bt_stream *stream);
 
-extern bt_stream_status bt_stream_set_name(bt_stream *stream,
+typedef enum bt_stream_set_name_status {
+	BT_STREAM_SET_NAME_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_STREAM_SET_NAME_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_stream_set_name_status;
+
+extern bt_stream_set_name_status bt_stream_set_name(bt_stream *stream,
 		const char *name);
 
 #ifdef __cplusplus
 }
 #endif
 
+#include <babeltrace2/undef-func-status.h>
+
 #endif /* BABELTRACE_TRACE_IR_STREAM_H */