Compile fixes for 64-bit

Reported by Francis Giraldeau.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index 02b209117475a8939ce8703c959aa3c846c68c29..ea60d88ab951633c71eca1a1640cfb38d8563885 100644 (file)
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -25,6 +25,7 @@
 #include <limits.h>
 #include <string.h>
 #include <glib.h>
 #include <limits.h>
 #include <string.h>
 #include <glib.h>

+#include <assert.h>

 
 /* Preallocate this many fields for structures */
 #define DEFAULT_NR_STRUCT_FIELDS 8
 
 /* Preallocate this many fields for structures */
 #define DEFAULT_NR_STRUCT_FIELDS 8

diff --git a/types/enum.c b/types/enum.c
index 015cf7fc757deaeaaefc1fb946f9d19f7b213abb..199618115dcdd96e52b58559806451e91a40740b 100644 (file)
--- a/types/enum.c
+++ b/types/enum.c
@@ -145,7 +145,7 @@ void enum_signed_insert(struct type_class_enum *enum_class,
                            (gpointer) (unsigned long) q);
        g_hash_table_insert(enum_class->table.quark_to_value,
                            (gpointer) (unsigned long) q,
                            (gpointer) (unsigned long) q);
        g_hash_table_insert(enum_class->table.quark_to_value,
                            (gpointer) (unsigned long) q,

-                           valuep);
+                           (gpointer) v);

 }
 
 void enum_unsigned_insert(struct type_class_enum *enum_class,
 }
 
 void enum_unsigned_insert(struct type_class_enum *enum_class,


@@ -155,7 +155,7 @@ void enum_unsigned_insert(struct type_class_enum *enum_class,
                            (gpointer) (unsigned long) q);
        g_hash_table_insert(enum_class->table.quark_to_value,
                            (gpointer) (unsigned long) q,
                            (gpointer) (unsigned long) q);
        g_hash_table_insert(enum_class->table.quark_to_value,
                            (gpointer) (unsigned long) q,

-                           valuep);
+                           (gpointer) v);

 }
 #endif /* __WORDSIZE != 32 */
 
 }
 #endif /* __WORDSIZE != 32 */