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

diff --git a/include/babeltrace2/trace-ir/trace-class.h b/include/babeltrace2/trace-ir/trace-class.h
index ba1372f1..1a32127e 100644
--- a/include/babeltrace2/trace-ir/trace-class.h
+++ b/include/babeltrace2/trace-ir/trace-class.h
@@ -27,16 +27,18 @@
  * http://www.efficios.com/ctf
  */
 
+#include <stdint.h>
+
 /*
  * For bt_bool, bt_uuid, bt_trace_class, bt_stream_class,
  * bt_field_class, bt_self_component
  */
 #include <babeltrace2/types.h>
 
-/* For bt_trace_class_status */
-#include <babeltrace2/trace-ir/trace-class-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" {
@@ -47,17 +49,29 @@ extern bt_trace_class *bt_trace_class_create(bt_self_component *self_comp);
 extern void bt_trace_class_set_assigns_automatic_stream_class_id(
 		bt_trace_class *trace_class, bt_bool value);
 
-extern bt_trace_class_status bt_trace_class_set_name(
+typedef enum bt_trace_class_set_name_status {
+	BT_TRACE_CLASS_SET_NAME_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_TRACE_CLASS_SET_NAME_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_trace_class_set_name_status;
+
+extern bt_trace_class_set_name_status bt_trace_class_set_name(
 		bt_trace_class *trace_class, const char *name);
 
 extern void bt_trace_class_set_uuid(bt_trace_class *trace_class,
 		bt_uuid uuid);
 
-extern bt_trace_class_status bt_trace_class_set_environment_entry_integer(
+typedef enum bt_trace_class_set_environment_entry_status {
+	BT_TRACE_CLASS_SET_ENVIRONMENT_ENTRY_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_TRACE_CLASS_SET_ENVIRONMENT_ENTRY_STATUS_OK		= __BT_FUNC_STATUS_OK,
+} bt_trace_class_set_environment_entry_status;
+
+extern bt_trace_class_set_environment_entry_status
+bt_trace_class_set_environment_entry_integer(
 		bt_trace_class *trace_class,
 		const char *name, int64_t value);
 
-extern bt_trace_class_status bt_trace_class_set_environment_entry_string(
+extern bt_trace_class_set_environment_entry_status
+bt_trace_class_set_environment_entry_string(
 		bt_trace_class *trace_class,
 		const char *name, const char *value);
 
@@ -71,4 +85,6 @@ extern bt_stream_class *bt_trace_class_borrow_stream_class_by_id(
 }
 #endif
 
+#include <babeltrace2/undef-func-status.h>
+
 #endif /* BABELTRACE_TRACE_IR_TRACE_CLASS_H */