X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=4e3cc45c7849dbc93168bdfbbf725e82c6ff0a12;hp=f096d5b6dc4081626087094598bc1f59f2cbb1d9;hb=b4b292cc76e04e9efda111e492251d8e7aefe451;hpb=01c76b246be85b5d9c8e99813950fb194c9f714f

diff --git a/types/enum.c b/types/enum.c
index f096d5b6..4e3cc45c 100644
--- a/types/enum.c
+++ b/types/enum.c
@@ -20,9 +20,18 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 #include <glib.h>
 
+#if (__LONG_MAX__ == 2147483647L)
+#define WORD_SIZE	32
+#elif (__LONG_MAX__ == 9223372036854775807L)
+#define WORD_SIZE	64
+#else
+#error "Unknown long size."
+#endif
+
 static
 struct definition *_enum_definition_new(struct declaration *declaration,
 					struct definition_scope *parent_scope,
@@ -37,7 +46,7 @@ void enum_range_set_free(void *ptr)
 	g_array_unref(ptr);
 }
 
-#if (__WORDSIZE == 32)
+#if (WORD_SIZE == 32)
 static inline
 gpointer get_uint_v(uint64_t *v)
 {
@@ -72,7 +81,7 @@ void enum_val_free(void *ptr)
 {
 	g_free(ptr);
 }
-#else  /* __WORDSIZE != 32 */
+#else  /* WORD_SIZE != 32 */
 static inline
 gpointer get_uint_v(uint64_t *v)
 {
@@ -101,7 +110,7 @@ static
 void enum_val_free(void *ptr)
 {
 }
-#endif /* __WORDSIZE != 32 */
+#endif /* WORD_SIZE != 32 */
 
 /*
  * Returns a GArray or NULL.
@@ -118,7 +127,7 @@ GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration,
 				 get_uint_v(&v));
 
 	/* Range lookup */
-	cds_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) {
+	bt_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) {
 		if (iter->range.start._unsigned > v || iter->range.end._unsigned < v)
 			continue;
 		if (!ranges) {
@@ -165,7 +174,7 @@ GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration,
 				 get_int_v(&v));
 
 	/* Range lookup */
-	cds_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) {
+	bt_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) {
 		if (iter->range.start._signed > v || iter->range.end._signed < v)
 			continue;
 		if (!ranges) {
@@ -210,12 +219,12 @@ void enum_unsigned_insert_value_to_quark_set(struct declaration_enum *enum_decla
 		array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
 		g_array_set_size(array, 1);
 		g_array_index(array, GQuark, array->len - 1) = q;
-#if (__WORDSIZE == 32)
+#if (WORD_SIZE == 32)
 		valuep = g_new(uint64_t, 1);
 		*valuep = v;
-#else  /* __WORDSIZE != 32 */
+#else  /* WORD_SIZE != 32 */
 		valuep = get_uint_v(&v);
-#endif /* __WORDSIZE != 32 */
+#endif /* WORD_SIZE != 32 */
 		g_hash_table_insert(enum_declaration->table.value_to_quark_set, valuep, array);
 	} else {
 		g_array_set_size(array, array->len + 1);
@@ -236,12 +245,12 @@ void enum_signed_insert_value_to_quark_set(struct declaration_enum *enum_declara
 		array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
 		g_array_set_size(array, 1);
 		g_array_index(array, GQuark, array->len - 1) = q;
-#if (__WORDSIZE == 32)
+#if (WORD_SIZE == 32)
 		valuep = g_new(int64_t, 1);
 		*valuep = v;
-#else  /* __WORDSIZE != 32 */
+#else  /* WORD_SIZE != 32 */
 		valuep = get_int_v(&v);
-#endif /* __WORDSIZE != 32 */
+#endif /* WORD_SIZE != 32 */
 		g_hash_table_insert(enum_declaration->table.value_to_quark_set, valuep, array);
 	} else {
 		g_array_set_size(array, array->len + 1);
@@ -263,7 +272,7 @@ void enum_signed_insert_range_to_quark(struct declaration_enum *enum_declaration
 	struct enum_range_to_quark *rtoq;
 
 	rtoq = g_new(struct enum_range_to_quark, 1);
-	cds_list_add(&rtoq->node, &enum_declaration->table.range_to_quark);
+	bt_list_add(&rtoq->node, &enum_declaration->table.range_to_quark);
 	rtoq->range.start._signed = start;
 	rtoq->range.end._signed = end;
 	rtoq->quark = q;
@@ -276,7 +285,7 @@ void enum_unsigned_insert_range_to_quark(struct declaration_enum *enum_declarati
 	struct enum_range_to_quark *rtoq;
 
 	rtoq = g_new(struct enum_range_to_quark, 1);
-	cds_list_add(&rtoq->node, &enum_declaration->table.range_to_quark);
+	bt_list_add(&rtoq->node, &enum_declaration->table.range_to_quark);
 	rtoq->range.start._unsigned = start;
 	rtoq->range.end._unsigned = end;
 	rtoq->quark = q;
@@ -364,8 +373,8 @@ void _enum_declaration_free(struct declaration *declaration)
 	struct enum_range_to_quark *iter, *tmp;
 
 	g_hash_table_destroy(enum_declaration->table.value_to_quark_set);
-	cds_list_for_each_entry_safe(iter, tmp, &enum_declaration->table.range_to_quark, node) {
-		cds_list_del(&iter->node);
+	bt_list_for_each_entry_safe(iter, tmp, &enum_declaration->table.range_to_quark, node) {
+		bt_list_del(&iter->node);
 		g_free(iter);
 	}
 	g_hash_table_destroy(enum_declaration->table.quark_to_range_set);
@@ -384,7 +393,7 @@ struct declaration_enum *
 							    enum_val_equal,
 							    enum_val_free,
 							    enum_range_set_free);
-	CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);
+	BT_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);
 	enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_direct_hash,
 							g_direct_equal,
 							NULL, enum_range_set_free);