Merge pull request #844 from Unity-Technologies/unity-master-sync-il2cpp-fixes

Sync IL2CPP fixes for older MSVC

Author: joncham

mono/eglib/gdir-unity.c

@@ -60,13 +60,14 @@ GDir *
 g_dir_open (const gchar *path, guint flags, GError **error)
 {
     GDir *dir;
+    gboolean success;
 
     g_return_val_if_fail (path != NULL, NULL);
     g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
     dir = g_new0 (GDir, 1);
 
-    gboolean success = setup_dir_handle(dir, path, error);
+    success = setup_dir_handle(dir, path, error);
     if (!success)
         return NULL;
 

mono/eglib/glib.h

@@ -14,7 +14,10 @@
 #endif
 
 #include <stdint.h>
+
+#ifndef _MSC_VER // inttypes.h doesn't exist on VS2010
 #include <inttypes.h>
+#endif
 
 #include <eglib-config.h>
 #ifndef EGLIB_NO_REMAP
@@ -44,6 +47,10 @@
 #define G_END_DECLS
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define inline __inline
+#endif
+
 G_BEGIN_DECLS
 
 /*