2008-07-03 Zoltan Varga <vargaz@gmail.com>

	* mini.h: Add some missing prototypes.

	* ssa.c local-propagation.c debug-debuger.c: Fix warnings.

	* driver.c (mono_jit_init_version): Correct the comments since the first
	argument should be the name of the root domain, not a filename.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index eaf6e3521cbd12dc46cac112ef4c55afa643646a..050ad65981ee58677fa68d8c26ca36d4aec7abdc 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-03  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini.h: Add some missing prototypes.
+
+       * ssa.c local-propagation.c debug-debuger.c: Fix warnings.
+
        * driver.c (mono_jit_init_version): Correct the comments since the first
        argument should be the name of the root domain, not a filename.
 

diff --git a/mono/mini/debug-debugger.c b/mono/mini/debug-debugger.c
index fa0f554468e19bc47a4d1b84aa63ad498c1d4a33..2ff332fe37ba4f698f85dd45ebc9e81620761322 100644 (file)
--- a/mono/mini/debug-debugger.c
+++ b/mono/mini/debug-debugger.c
@@ -435,12 +435,16 @@ debugger_init_threads (void)
        gc_thread_vtable = &debugger_thread_vtable;
 }
 
+#if 0
+
 static void
 debugger_finalize_threads (void)
 {
        gc_thread_vtable = NULL;
 }
 
+#endif
+
 static guint64
 debugger_init_code_buffer (void)
 {

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index 24ae10cbb59fd32588c9a9073258ebfd6ebe8e33..68fd7570ae1c61059c04087d6e2235adcf1b2244 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -1662,7 +1662,7 @@ mono_jit_init (const char *file)
 
 /**
  * mono_jit_init_version:
- * @file: the initial assembly to load
+ * @domain_name: the name of the root domain
  * @runtime_version: the version of the runtime to load
  *
  * Use this version when you want to force a particular runtime
@@ -1680,9 +1680,9 @@ mono_jit_init (const char *file)
  * was loaded.
  */
 MonoDomain * 
-mono_jit_init_version (const char *file, const char *runtime_version)
+mono_jit_init_version (const char *domain_name, const char *runtime_version)
 {
-       return mini_init (file, runtime_version);
+       return mini_init (domain_name, runtime_version);
 }
 
 void        

diff --git a/mono/mini/jit.h b/mono/mini/jit.h
index de251f465dab35fcc0c416dae13daa61715eec90..701adb3759c086f1cd331637dfd63818809e01f7 100644 (file)
--- a/mono/mini/jit.h
+++ b/mono/mini/jit.h
@@ -16,7 +16,7 @@ MonoDomain *
 mono_jit_init              (const char *file);
 
 MonoDomain * 
-mono_jit_init_version      (const char *file, const char *runtime_version);
+mono_jit_init_version      (const char *root_domain_name, const char *runtime_version);
 
 int
 mono_jit_exec              (MonoDomain *domain, MonoAssembly *assembly, 

diff --git a/mono/mini/local-propagation.c b/mono/mini/local-propagation.c
index 32087371d86383fcae82ad25fe5d1a5f890d01a1..7bd498d37d9689b3671d31ba9719f45d49c40bc0 100644 (file)
--- a/mono/mini/local-propagation.c
+++ b/mono/mini/local-propagation.c
@@ -855,7 +855,7 @@ mono_local_cprop_bb (MonoCompile *cfg, TreeMover *tree_mover, MonoBasicBlock *bb
 
                        acp [tree->inst_i0->inst_c0] = NULL;
                        if (MONO_DEBUG_TREE_MOVER) {
-                               printf ("Assignment clears ACP[%d] at tree ", tree->inst_i0->inst_c0);
+                               printf ("Assignment clears ACP[%d] at tree ", (int)tree->inst_i0->inst_c0);
                                mono_print_tree (tree);
                                printf ("\n");
                        }
@@ -893,7 +893,7 @@ mono_local_cprop_bb (MonoCompile *cfg, TreeMover *tree_mover, MonoBasicBlock *bb
                                acp [tree->inst_i0->inst_c0] = i1->inst_i0;
                                tree_can_be_moved = FALSE;
                                if (MONO_DEBUG_LOCAL_PROP) {
-                                       printf ("  Consequently, ACP[%d] becomes local ", tree->inst_i0->inst_c0);
+                                       printf ("  Consequently, ACP[%d] becomes local ", (int)tree->inst_i0->inst_c0);
                                        mono_print_tree (i1->inst_i0);
                                        printf ("\n");
                                }

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 21634389d53474ee9a0affb88345d3d0a7f043e7..d9ad0031effaf62935d9025427efd7f1e6465c11 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -1375,6 +1375,11 @@ MonoType* mini_get_basic_type_from_generic (MonoGenericSharingContext *gsctx, Mo
 
 int mini_type_stack_size (MonoGenericSharingContext *gsctx, MonoType *t, int *align) MONO_INTERNAL;
 
+/* wapihandles.c */
+int mini_wapi_hps (int argc, char **argv) MONO_INTERNAL;
 
+int mini_wapi_semdel (int argc, char **argv) MONO_INTERNAL;
+
+int mini_wapi_seminfo (int argc, char **argv) MONO_INTERNAL;
 
 #endif /* __MONO_MINI_H__ */

diff --git a/mono/mini/ssa.c b/mono/mini/ssa.c
index 134e16caf33c490d6c2b8426d76dc48127128bf7..9c2ec84dfe8ea8ae034eca95a016039fefe7ed0d 100644 (file)
--- a/mono/mini/ssa.c
+++ b/mono/mini/ssa.c
@@ -136,6 +136,8 @@ replace_usage (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *inst, MonoInst **
        }
 }
 
+#if 0
+
 static int
 extends_live (MonoInst *inst)
 {
@@ -192,6 +194,8 @@ replace_usage_new (MonoCompile *cfg, MonoInst *inst, int varnum, MonoInst *rep)
        return 0;
 }
 
+#endif
+
 static void
 mono_ssa_rename_vars (MonoCompile *cfg, int max_vars, MonoBasicBlock *bb, MonoInst **stack) 
 {