Babeltrace type: build warning cleanup

[babeltrace.git] / types / struct.c

diff --git a/types/struct.c b/types/struct.c
index a1bfbf431055539b610791c221144c4dec6da4e4..d3e9f3c484cd11e88aeed88daeb4003a03623c5b 100644 (file)
--- a/types/struct.c
+++ b/types/struct.c
@@ -19,6 +19,10 @@
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
 
+#ifndef max
+#define max(a, b)      ((a) < (b) ? (b) : (a))
+#endif
+
 void struct_copy(struct stream_pos *dest, const struct format *fdest, 
                 struct stream_pos *src, const struct format *fsrc,
                 const struct type_class *type_class)
@@ -85,7 +89,7 @@ struct type_class_struct *struct_type_new(const char *name)
        type_class->ref = 1;
 
        if (type_class->name) {
-               ret = ctf_register_type(type_class);
+               ret = register_type(type_class);
                if (ret)
                        goto error_register;
        }