X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fclock-snapshot-const.h;h=3363b9df8318466a0998961eec562aab4334de1b;hb=7b6afccb24b31e2feed787c2ed97809e797c3070;hp=6ac6576abf3432e68aba3f355f458781353d3c52;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/clock-snapshot-const.h b/include/babeltrace2/trace-ir/clock-snapshot-const.h
index 6ac6576a..3363b9df 100644
--- a/include/babeltrace2/trace-ir/clock-snapshot-const.h
+++ b/include/babeltrace2/trace-ir/clock-snapshot-const.h
@@ -1,9 +1,8 @@
-#ifndef BABELTRACE_TRACE_IR_CLOCK_SNAPSHOT_CONST_H
-#define BABELTRACE_TRACE_IR_CLOCK_SNAPSHOT_CONST_H
+#ifndef BABELTRACE2_TRACE_IR_CLOCK_SNAPSHOT_CONST_H
+#define BABELTRACE2_TRACE_IR_CLOCK_SNAPSHOT_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,32 +21,33 @@
  * 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_clock_class, bt_clock_snapshot */
 #include <babeltrace2/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef enum bt_clock_snapshot_status {
-	BT_CLOCK_SNAPSHOT_STATUS_OK = 0,
-	BT_CLOCK_SNAPSHOT_STATUS_OVERFLOW = -75,
-} bt_clock_snapshot_status;
-
 extern const bt_clock_class *bt_clock_snapshot_borrow_clock_class_const(
 		const bt_clock_snapshot *clock_snapshot);
 
 extern uint64_t bt_clock_snapshot_get_value(
 		const bt_clock_snapshot *clock_snapshot);
 
-extern bt_clock_snapshot_status bt_clock_snapshot_get_ns_from_origin(
+typedef enum bt_clock_snapshot_get_ns_from_origin_status {
+	BT_CLOCK_SNAPSHOT_GET_NS_FROM_ORIGIN_STATUS_OK			= __BT_FUNC_STATUS_OK,
+	BT_CLOCK_SNAPSHOT_GET_NS_FROM_ORIGIN_STATUS_OVERFLOW_ERROR	= __BT_FUNC_STATUS_OVERFLOW_ERROR,
+} bt_clock_snapshot_get_ns_from_origin_status;
+
+extern bt_clock_snapshot_get_ns_from_origin_status
+bt_clock_snapshot_get_ns_from_origin(
 		const bt_clock_snapshot *clock_snapshot,
 		int64_t *ns_from_origin);
 
@@ -55,4 +55,4 @@ extern bt_clock_snapshot_status bt_clock_snapshot_get_ns_from_origin(
 }
 #endif
 
-#endif /* BABELTRACE_TRACE_IR_CLOCK_SNAPSHOT_CONST_H */
+#endif /* BABELTRACE2_TRACE_IR_CLOCK_SNAPSHOT_CONST_H */