From 324c33e4a667ffd84e226ca8def7f4f9daf143e1 Mon Sep 17 00:00:00 2001
From: Neale <neale@sinenomine.net>
Date: Fri, 22 Jan 2016 10:36:28 -0500
Subject: [PATCH] Adjust last fix to bypass another compiler failing

---
 mono/metadata/icall.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index efe8fdf3869..05d8824aeb2 100644
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -823,9 +823,10 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray (MonoAr
 #define SWAP(n) {								\
 	guint ## n *data = (guint ## n *) mono_array_addr (array, char, 0); 	\
 	guint ## n *src = (guint ## n *) field_data; 				\
-	int i;									\
+	int i,									\
+	    nEnt = (size / sizeof(guint ## n));					\
 										\
-	for (i = 0; i < (size / sizeof(guint ## n)); i++) { 			\
+	for (i = 0; i < nEnt; i++) {						\
 		data[i] = read ## n (&src[i]);					\
 	} 									\
 }
-- 
2.25.1