From 805f95eac61ef17d7ec3f87dda1dfbc932951dee Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Wed, 4 Sep 2013 10:06:07 +0000
Subject: remove the dependency on the HAVE_STATEMENT_EXPRESSIONS flag. This
 reduces the dependency on the ./configure script

---
 src/runtime/c/gu/map.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/runtime/c/gu/map.c')

diff --git a/src/runtime/c/gu/map.c b/src/runtime/c/gu/map.c
index cc3b7e829..6505953af 100644
--- a/src/runtime/c/gu/map.c
+++ b/src/runtime/c/gu/map.c
@@ -23,10 +23,10 @@ struct GuMapData {
 };
 
 struct GuMap {
-	GuMapKind const kind;
-	GuHasher* const hasher;
-	size_t const key_size;
-	size_t const value_size;
+	GuMapKind kind;
+	GuHasher* hasher;
+	size_t key_size;
+	size_t value_size;
 	const void* default_value;
 	GuMapData data;
 	
@@ -380,16 +380,14 @@ gu_make_map(size_t key_size, GuHasher* hasher,
 		.values = value_size ? NULL : (uint8_t*) gu_map_no_values,
 		.zero_idx = SIZE_MAX
 	};
-	GuMap* map = gu_new_i(
-		pool, GuMap,
-		.default_value = default_value,
-		.hasher = hasher,
-		.data = data,
-		.key_size = key_size,
-		.value_size = value_size,
-		.fin.fn = gu_map_finalize,
-		.kind = kind
-		);
+	GuMap* map = gu_new(GuMap, pool);
+	map->default_value = default_value;
+	map->hasher = hasher;
+	map->data = data;
+	map->key_size = key_size;
+	map->value_size = value_size;
+	map->fin.fn = gu_map_finalize;
+	map->kind = kind;
 	gu_pool_finally(pool, &map->fin);
 	gu_map_resize(map);
 	return map;
-- 
cgit v1.2.3