X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fclock-class-const.h;h=b4affd536a19d6f0cece9012da00fe524fa6078b;hb=520cdc8260ea033f1c9f54b87d93fcb034ae8472;hp=c5a303dfcf758b714df16b429a00c622ba604523;hpb=924dc299c8a893e92fcd985fa05c245b591ef314;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/clock-class-const.h b/include/babeltrace2/trace-ir/clock-class-const.h
index c5a303df..b4affd53 100644
--- a/include/babeltrace2/trace-ir/clock-class-const.h
+++ b/include/babeltrace2/trace-ir/clock-class-const.h
@@ -2,8 +2,7 @@
 #define BABELTRACE2_TRACE_IR_CLOCK_CLASS_CONST_H
 
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- * Copyright 2013, 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,21 +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_clock_class */
 #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
@@ -63,7 +57,7 @@ extern bt_uuid bt_clock_class_get_uuid(
 		const bt_clock_class *clock_class);
 
 typedef enum bt_clock_class_cycles_to_ns_from_origin_status {
-	BT_CLOCK_CLASS_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OVERFLOW		= __BT_FUNC_STATUS_OVERFLOW,
+	BT_CLOCK_CLASS_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OVERFLOW_ERROR	= __BT_FUNC_STATUS_OVERFLOW_ERROR,
 	BT_CLOCK_CLASS_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OK		= __BT_FUNC_STATUS_OK,
 } bt_clock_class_cycles_to_ns_from_origin_status;
 
@@ -93,6 +87,4 @@ extern void bt_clock_class_put_ref(const bt_clock_class *clock_class);
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE2_TRACE_IR_CLOCK_CLASS_CONST_H */