Remove legacy `include/babeltrace2/{ctf-ir,ctf}` directories

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

diff --git a/include/babeltrace2/ctf-writer/field-types.h b/include/babeltrace2/ctf-writer/field-types.h
index bd0549e16663b5f082cc1310298b3fd6c13f83ac..10b10338b0129e4901383ae80c811c49d38ebc1d 100644 (file)
--- a/include/babeltrace2/ctf-writer/field-types.h
+++ b/include/babeltrace2/ctf-writer/field-types.h
@@ -1,10 +1,8 @@
-#ifndef BABELTRACE_CTF_WRITER_FIELD_TYPES_H
-#define BABELTRACE_CTF_WRITER_FIELD_TYPES_H
+#ifndef BABELTRACE2_CTF_WRITER_FIELD_TYPES_H
+#define BABELTRACE2_CTF_WRITER_FIELD_TYPES_H
 
 /*
- * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: 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
@@ -23,15 +21,11 @@
  * 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
  */
 
 #include <stdint.h>
 #include <stddef.h>
-
-#include <babeltrace2/types.h>
+#include <babeltrace2/ctf-writer/types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -145,7 +139,7 @@ extern int bt_ctf_field_type_integer_get_size(
 extern int bt_ctf_field_type_integer_set_size(
                struct bt_ctf_field_type *int_field_type, unsigned int size);
 
-extern bt_bool bt_ctf_field_type_integer_is_signed(
+extern bt_ctf_bool bt_ctf_field_type_integer_is_signed(
                struct bt_ctf_field_type *int_field_type);
 
 /* Pre-2.0 CTF writer compatibility */
@@ -157,7 +151,7 @@ int bt_ctf_field_type_integer_get_signed(
 }
 
 extern int bt_ctf_field_type_integer_set_is_signed(
-               struct bt_ctf_field_type *int_field_type, bt_bool is_signed);
+               struct bt_ctf_field_type *int_field_type, bt_ctf_bool is_signed);
 
 /* Pre-2.0 CTF writer compatibility */
 static inline
@@ -165,7 +159,7 @@ int bt_ctf_field_type_integer_set_signed(
                struct bt_ctf_field_type *int_field_type, int is_signed)
 {
        return bt_ctf_field_type_integer_set_is_signed(int_field_type,
-               is_signed ? BT_TRUE : BT_FALSE);
+               is_signed ? BT_CTF_TRUE : BT_CTF_FALSE);
 }
 
 extern enum bt_ctf_integer_base bt_ctf_field_type_integer_get_base(
@@ -342,4 +336,4 @@ extern int bt_ctf_field_type_variant_add_field(
 }
 #endif
 
-#endif /* BABELTRACE_CTF_WRITER_FIELD_TYPES_H */
+#endif /* BABELTRACE2_CTF_WRITER_FIELD_TYPES_H */