lib: standardize public include guards

[babeltrace.git] / include / babeltrace2 / ctf-writer / clock.h

diff --git a/include/babeltrace2/ctf-writer/clock.h b/include/babeltrace2/ctf-writer/clock.h
index 8cef6b6910e43c7b9f593769c9942e3b3f52692f..73722a187b4782522f54c2851aca235d92b0ca6f 100644 (file)
--- a/include/babeltrace2/ctf-writer/clock.h
+++ b/include/babeltrace2/ctf-writer/clock.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_CTF_WRITER_CLOCK_H
-#define BABELTRACE_CTF_WRITER_CLOCK_H
+#ifndef BABELTRACE2_CTF_WRITER_CLOCK_H
+#define BABELTRACE2_CTF_WRITER_CLOCK_H
 
 /*
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 #include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/types.h>
+#include <babeltrace2/ctf-writer/types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -224,7 +224,7 @@ extern int bt_ctf_clock_set_is_absolute(struct bt_ctf_clock *clock,
  * Returns a pointer to the clock's UUID (16 byte array) on success,
  * NULL on error.
  */
-extern const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock);
+extern const uint8_t *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock);
 
 /*
  * bt_ctf_clock_set_uuid: set a clock's UUID.
@@ -237,7 +237,7 @@ extern const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock);
  * Returns 0 on success, a negative value on error.
  */
 extern int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock,
-        const unsigned char *uuid);
+        const uint8_t *uuid);
 
 /*
  * bt_ctf_clock_set_time: set a clock's current time value.
@@ -284,4 +284,4 @@ void bt_ctf_clock_put(struct bt_ctf_clock *clock)
 }
 #endif
 
-#endif /* BABELTRACE_CTF_WRITER_CLOCK_H */
+#endif /* BABELTRACE2_CTF_WRITER_CLOCK_H */