From: Jon Purdy <evincarofautumn@gmail.com>
Date: Tue, 12 May 2015 17:55:33 +0000 (-0700)
Subject: [sgen] Avoid designated initializer.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=ce9b7f4a58c28950ef6b8187462336cd12c41ff6;p=mono.git

[sgen] Avoid designated initializer.

Designated-initializer expressions are not considered constant
expressions, so they can't be used to initialize static variables.
---

diff --git a/mono/sgen/sgen-gchandles.c b/mono/sgen/sgen-gchandles.c
index ba0161ac466..8e96c718dd3 100644
--- a/mono/sgen/sgen-gchandles.c
+++ b/mono/sgen/sgen-gchandles.c
@@ -146,22 +146,11 @@ try_occupy_slot (HandleData *handles, guint bucket, guint offset, GCObject *obj,
 	return try_set_slot (link_addr, obj, NULL, handles->type) != NULL;
 }
 
-#define EMPTY_HANDLE_DATA(t) \
-	(HandleData) { \
-		.entries = { NULL }, \
-		.capacity = 0, \
-		.slot_hint = 0, \
-		.max_index = 0, \
-		.type = (t) \
-	}
-
-/* weak and weak-track arrays will be allocated in malloc memory 
- */
 static HandleData gc_handles [] = {
-	EMPTY_HANDLE_DATA (HANDLE_WEAK),
-	EMPTY_HANDLE_DATA (HANDLE_WEAK_TRACK),
-	EMPTY_HANDLE_DATA (HANDLE_NORMAL),
-	EMPTY_HANDLE_DATA (HANDLE_PINNED)
+	{ { NULL }, 0, 0, 0, (HANDLE_WEAK) },
+	{ { NULL }, 0, 0, 0, (HANDLE_WEAK_TRACK) },
+	{ { NULL }, 0, 0, 0, (HANDLE_NORMAL) },
+	{ { NULL }, 0, 0, 0, (HANDLE_PINNED) }
 };
 
 static HandleData *