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

diff --git a/include/babeltrace2/trace-ir/trace-class.h b/include/babeltrace2/trace-ir/trace-class.h
index 1a32127e..52a87bab 100644
--- a/include/babeltrace2/trace-ir/trace-class.h
+++ b/include/babeltrace2/trace-ir/trace-class.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_TRACE_CLASS_H
-#define BABELTRACE_TRACE_IR_TRACE_CLASS_H
+#ifndef BABELTRACE2_TRACE_IR_TRACE_CLASS_H
+#define BABELTRACE2_TRACE_IR_TRACE_CLASS_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -27,19 +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_bool, bt_uuid, bt_trace_class, bt_stream_class,
- * bt_field_class, bt_self_component
- */
+/* For bt_bool, bt_trace_class, bt_stream_class, bt_self_component */
 #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
@@ -49,32 +45,6 @@ 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);
 
-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);
-
-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_set_environment_entry_status
-bt_trace_class_set_environment_entry_string(
-		bt_trace_class *trace_class,
-		const char *name, const char *value);
-
 extern bt_stream_class *bt_trace_class_borrow_stream_class_by_index(
 		bt_trace_class *trace_class, uint64_t index);
 
@@ -85,6 +55,4 @@ 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 */
+#endif /* BABELTRACE2_TRACE_IR_TRACE_CLASS_H */