CTF float/types compile fixes

[babeltrace.git] / include / babeltrace / ctf / types.h

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 448ea9524ef897ca84c86279f360560f7823c0d1..6db8d27081848845a5674203ffc4f2a3fd0964a7 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -19,6 +19,7 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/types.h>
 #include <stdint.h>
 #include <glib.h>
 
@@ -52,19 +53,20 @@ long double ctf_ldouble_read(struct stream_pos *pos,
 void ctf_ldouble_write(struct stream_pos *pos,
                const struct type_class_float *dest,
                long double v);
-void ctf_float_copy(struct stream_pos *destp, const struct type_class_float *dest,
-               struct stream_pos *srcp, const struct type_class_float *src);
+void ctf_float_copy(struct stream_pos *destp,
+               struct stream_pos *srcp,
+               const struct type_class_float *float_class);
 
 void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
                     const struct type_class_string *string_class);
-void ctf_string_read(unsigned char **dest, struct stream_pos *src,
+void ctf_string_read(char **dest, struct stream_pos *src,
                     const struct type_class_string *string_class);
-void ctf_string_write(struct stream_pos *dest, const unsigned char *src,
+void ctf_string_write(struct stream_pos *dest, const char *src,
                      const struct type_class_string *string_class);
-void ctf_string_free_temp(unsigned char *string);
+void ctf_string_free_temp(char *string);
 
-GQuark ctf_enum_read(struct stream_pos *pos,
-               const struct type_class_enum *src);
+GArray *ctf_enum_read(struct stream_pos *pos,
+                     const struct type_class_enum *src);
 void ctf_enum_write(struct stream_pos *pos,
                const struct type_class_enum *dest,
                GQuark q);
@@ -72,6 +74,10 @@ void ctf_struct_begin(struct stream_pos *pos,
                      const struct type_class_struct *struct_class);
 void ctf_struct_end(struct stream_pos *pos,
                    const struct type_class_struct *struct_class);
+void ctf_variant_begin(struct stream_pos *pos,
+                      const struct type_class_variant *variant_class);
+void ctf_variant_end(struct stream_pos *pos,
+                    const struct type_class_variant *variant_class);
 void ctf_array_begin(struct stream_pos *pos,
                     const struct type_class_array *array_class);
 void ctf_array_end(struct stream_pos *pos,