X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Ftrace-class-const.h;h=6ad9a9d7d3114b2b895e130a3d0fecd60a51654e;hb=1cda4ff4025e4b3f7bd2a861baa51d2113c4cbf9;hp=6c6a9f4ac1371e53cfa8544fcf6b41e97fdd2460;hpb=335a2da576e59d32c17de2ece1e7e339c50e9c25;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/trace-class-const.h b/include/babeltrace2/trace-ir/trace-class-const.h
index 6c6a9f4a..6ad9a9d7 100644
--- a/include/babeltrace2/trace-ir/trace-class-const.h
+++ b/include/babeltrace2/trace-ir/trace-class-const.h
@@ -1,9 +1,8 @@
-#ifndef BABELTRACE_TRACE_IR_TRACE_CLASS_CONST_H
-#define BABELTRACE_TRACE_IR_TRACE_CLASS_CONST_H
+#ifndef BABELTRACE2_TRACE_IR_TRACE_CLASS_CONST_H
+#define BABELTRACE2_TRACE_IR_TRACE_CLASS_CONST_H
 
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- * Copyright 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,24 +21,16 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * The Common Trace Format (CTF) Specification is available at
- * 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_value
- */
 #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
@@ -47,6 +38,9 @@ extern "C" {
 typedef void (* bt_trace_class_destruction_listener_func)(
 		const bt_trace_class *trace_class, void *data);
 
+extern const bt_value *bt_trace_class_borrow_user_attributes_const(
+		const bt_trace_class *trace_class);
+
 extern bt_bool bt_trace_class_assigns_automatic_stream_class_id(
 		const bt_trace_class *trace_class);
 
@@ -69,7 +63,7 @@ extern bt_trace_class_add_listener_status
 bt_trace_class_add_destruction_listener(
         const bt_trace_class *trace_class,
         bt_trace_class_destruction_listener_func listener,
-        void *data, uint64_t *listener_id);
+        void *data, bt_listener_id *listener_id);
 
 typedef enum bt_trace_class_remove_listener_status {
 	BT_TRACE_CLASS_REMOVE_LISTENER_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
@@ -78,7 +72,7 @@ typedef enum bt_trace_class_remove_listener_status {
 
 extern bt_trace_class_remove_listener_status
 bt_trace_class_remove_destruction_listener(
-        const bt_trace_class *trace_class, uint64_t listener_id);
+        const bt_trace_class *trace_class, bt_listener_id listener_id);
 
 extern void bt_trace_class_get_ref(const bt_trace_class *trace_class);
 
@@ -101,6 +95,4 @@ extern void bt_trace_class_put_ref(const bt_trace_class *trace_class);
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
-#endif /* BABELTRACE_TRACE_IR_TRACE_CLASS_CONST_H */
+#endif /* BABELTRACE2_TRACE_IR_TRACE_CLASS_CONST_H */