[jit] Fix an unpatched jump in the monitor exit trampoline on amd64.

[mono.git] / mono / mini / main.c

diff --git a/mono/mini/main.c b/mono/mini/main.c
index 808dda0c2fa3cc7811cb561cce25921abc1d1ed6..784179c64412c86fa7cdb933f081655e69ec94fc 100644 (file)
--- a/mono/mini/main.c
+++ b/mono/mini/main.c
@@ -1,10 +1,8 @@
 #include <config.h>
 #include "mini.h"
 #ifndef HOST_WIN32
-#ifdef HAVE_SGEN_GC
-#include "buildver-sgen.h"
-#else
-#include "buildver.h"
+#ifndef BUILDVER_INCLUDED
+#include "buildver-boehm.h"
 #endif
 #endif
 
@@ -16,12 +14,12 @@
 static int
 mono_main_with_options (int argc, char *argv [])
 {
-       const char *env_options = getenv ("MONO_ENV_OPTIONS");
+       const char *env_options = g_getenv ("MONO_ENV_OPTIONS");
        if (env_options != NULL){
                GPtrArray *array = g_ptr_array_new ();
                GString *buffer = g_string_new ("");
                const char *p;
-               int i;
+               unsigned i;
                gboolean in_quotes = FALSE;
                char quote_char = '\0';
 
@@ -96,7 +94,7 @@ mono_main_with_options (int argc, char *argv [])
 #ifdef HOST_WIN32
 
 int
-main ()
+main (void)
 {
        int argc;
        gunichar2** argvw;