.gitignore: add some missing files

[babeltrace.git] / src / ctf-writer / utils.h

diff --git a/src/ctf-writer/utils.h b/src/ctf-writer/utils.h
index c344bcbedc62bbee90c4aab392e3c4e8e10ab090..4bd6bd680525f09eaaaee7680ca8ac11b1daacb4 100644 (file)
--- a/src/ctf-writer/utils.h
+++ b/src/ctf-writer/utils.h
@@ -4,8 +4,8 @@
  * Copyright 2019 EfficiOS, Inc
  */
 
-#ifndef BABELTRACE_CTF_WRITER_UTILS_INTERNAL_H
-#define BABELTRACE_CTF_WRITER_UTILS_INTERNAL_H
+#ifndef BABELTRACE_CTF_WRITER_UTILS_H
+#define BABELTRACE_CTF_WRITER_UTILS_H
 
 #include "common/macros.h"
 #include <babeltrace2-ctf-writer/field-types.h>
@@ -14,7 +14,7 @@
 
 #include "field-path.h"
 
-#define BT_CTF_TO_COMMON(_obj)         (&(_obj)->common)
+#define BT_CTF_TO_COMMON(_obj)         ((typeof(&_obj->common)) _obj)
 #define BT_CTF_FROM_COMMON(_obj)       ((void *) _obj)
 
 struct bt_ctf_search_query {
@@ -204,4 +204,4 @@ end:
        return str;
 }
 
-#endif /* BABELTRACE_CTF_WRITER_UTILS_INTERNAL_H */
+#endif /* BABELTRACE_CTF_WRITER_UTILS_H */