2010-05-21 Zoltan Varga <vargaz@gmail.com>

	* mini.c (mono_jit_compile_method_inner): Remove a DISABLE_JIT block which was
	added by mistake.

svn path=/trunk/mono/; revision=157710

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 33ba118deec2924cb490683d889d44398e2f8417..b51f43a8fe2ee93a1807863b9427c0250a57a3a9 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-21  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini.c (mono_jit_compile_method_inner): Remove a DISABLE_JIT block which was
+       added by mistake.
+
        * mini-ppc.c: Fix the DISABLE_JIT build.
 
 2010-05-20  Zoltan Varga  <vargaz@gmail.com>

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 397fcf0f0dae3d0627991e6fe75fb61a519962b9..796c07270595a8355aa2932630ea972c132594dd 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -4648,7 +4648,6 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
        }
 #endif
 
-#ifndef DISABLE_JIT
        if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
            (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
                MonoMethod *nm;
@@ -4707,7 +4706,6 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                }
                return NULL;
        }
-#endif
 
        if (mono_aot_only) {
                char *fullname = mono_method_full_name (method, TRUE);