Fix warning

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

diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c
index 03b7ebefe25ee40e62de6bc560ad7fa63ea7dcee..0cdcbeda0f52d8374e36a7f763056f9da611d09c 100644 (file)
--- a/mono/metadata/metadata-verify.c
+++ b/mono/metadata/metadata-verify.c
@@ -6,7 +6,6 @@
  *
  * Copyright (C) 2005-2008 Novell, Inc. (http://www.novell.com)
  */
-
 #include <mono/metadata/object-internals.h>
 #include <mono/metadata/verify.h>
 #include <mono/metadata/verify-internals.h>
@@ -27,6 +26,7 @@
 #include <signal.h>
 #include <ctype.h>
 
+#ifndef DISABLE_VERIFIER
 /*
  TODO add fail fast mode
  TODO add PE32+ support
@@ -2119,3 +2119,22 @@ mono_verifier_verify_table_data (MonoImage *image, GSList **error_list)
 
        return cleanup_context (&ctx, error_list);
 }
+#else
+gboolean
+mono_verifier_verify_table_data (MonoImage *image, GSList **error_list)
+{
+       return TRUE;
+}
+
+gboolean
+mono_verifier_verify_cli_data (MonoImage *image, GSList **error_list)
+{
+       return TRUE;
+}
+
+gboolean
+mono_verifier_verify_pe_data (MonoImage *image, GSList **error_list)
+{
+       return TRUE;
+}
+#endif /* DISABLE_VERIFIER */

diff --git a/mono/metadata/mono-perfcounters.c b/mono/metadata/mono-perfcounters.c
index 9e4b88b2e3cc2cdf831b15733cbc255339cd9e37..8451091a3e8f476885c433db66df208c5958e4d6 100644 (file)
--- a/mono/metadata/mono-perfcounters.c
+++ b/mono/metadata/mono-perfcounters.c
@@ -360,7 +360,8 @@ static void
 predef_cleanup (ImplVtable *vtable)
 {
        PredefVtable *vt = (PredefVtable*)vtable;
-       ExternalSArea *data;
+       /* ExternalSArea *data; */
+       
        perfctr_lock ();
        if (!pid_to_shared_area) {
                perfctr_unlock ();

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index a7b85f0e60f5bd2875068be75e990d6cf5bd5189..031722f38ab41893f755fbd8cff3703a41d5be63 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -7,6 +7,7 @@
  * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
  * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
  */
+#include <config.h>
 
 #include <mono/metadata/object-internals.h>
 #include <mono/metadata/verify.h>
@@ -27,6 +28,26 @@
 #include <ctype.h>
 
 
+static MiniVerifierMode verifier_mode = MONO_VERIFIER_MODE_OFF;
+static gboolean verify_all = FALSE;
+
+/*
+ * Set the desired level of checks for the verfier.
+ * 
+ */
+void
+mono_verifier_set_mode (MiniVerifierMode mode)
+{
+       verifier_mode = mode;
+}
+
+void
+mono_verifier_enable_verify_all ()
+{
+       verify_all = TRUE;
+}
+
+#ifndef DISABLE_VERIFIER
 /*
  * Pull the list of opcodes
  */
@@ -5859,25 +5880,6 @@ mono_verify_corlib ()
        return NULL;
 }
 
-static MiniVerifierMode verifier_mode = MONO_VERIFIER_MODE_OFF;
-static gboolean verify_all = FALSE;
-
-/*
- * Set the desired level of checks for the verfier.
- * 
- */
-void
-mono_verifier_set_mode (MiniVerifierMode mode)
-{
-       verifier_mode = mode;
-}
-
-void
-mono_verifier_enable_verify_all ()
-{
-       verify_all = TRUE;
-}
-
 /*
  * Returns true if @method needs to be verified.
  * 
@@ -6002,3 +6004,55 @@ mono_verifier_verify_class (MonoClass *class)
                return FALSE;
        return TRUE;
 }
+#else
+
+gboolean
+mono_verifier_verify_class (MonoClass *class)
+{
+       /* The verifier was disabled at compile time */
+       return TRUE;
+}
+
+GSList*
+mono_method_verify_with_current_settings (MonoMethod *method, gboolean skip_visibility)
+{
+       /* The verifier was disabled at compile time */
+       return NULL;
+}
+
+gboolean
+mono_verifier_is_class_full_trust (MonoClass *klass)
+{
+       /* The verifier was disabled at compile time */
+       return TRUE;
+}
+
+gboolean
+mono_verifier_is_method_full_trust (MonoMethod *method)
+{
+       /* The verifier was disabled at compile time */
+       return TRUE;
+}
+
+gboolean
+mono_verifier_is_enabled_for_image (MonoImage *image)
+{
+       /* The verifier was disabled at compile time */
+       return FALSE;
+}
+
+gboolean
+mono_verifier_is_enabled_for_class (MonoClass *klass)
+{
+       /* The verifier was disabled at compile time */
+       return FALSE;
+}
+
+gboolean
+mono_verifier_is_enabled_for_method (MonoMethod *method)
+{
+       /* The verifier was disabled at compile time */
+       return FALSE;
+}
+
+#endif