diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-01-28 18:13:17 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-01-28 18:13:44 +0300 |
| commit | 205d9e09f02f5e97f24a3d2d92795cdfbbbe9fdd (patch) | |
| tree | aeb4b74bddcd2aef28b05d15b7698f64eab440b4 | |
| parent | 3bc96e9c0232d762ff8794b5a25d433572622a9f (diff) | |
[metadata] Fix duplicate variable declaration in coree.c that breaks msvc
A new 'error' variable was added in d7908572783b1a8f3b6f4b4685385a7becf0bab3 that clashes with the existing one.
| -rw-r--r-- | mono/metadata/coree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mono/metadata/coree.c b/mono/metadata/coree.c index 7c4be6afe7e..c2e47b9ca7b 100644 --- a/mono/metadata/coree.c +++ b/mono/metadata/coree.c @@ -143,7 +143,7 @@ __int32 STDMETHODCALLTYPE _CorExeMain(void) MonoMethod* method; guint32 entry; gchar* file_name; - gchar* error; + gchar* corlib_version_error; int argc; gunichar2** argvw; gchar** argv; @@ -153,9 +153,9 @@ __int32 STDMETHODCALLTYPE _CorExeMain(void) init_from_coree = TRUE; domain = mono_runtime_load (file_name, NULL); - error = (gchar*) mono_check_corlib_version (); - if (error) { - g_free (error); + corlib_version_error = (gchar*) mono_check_corlib_version (); + if (corlib_version_error) { + g_free (corlib_version_error); g_free (file_name); MessageBox (NULL, L"Corlib not in sync with this runtime.", NULL, MB_ICONERROR); mono_runtime_quit (); |