[Mono-list] Compile errors in /mono/mono/mono/dis/main.c and /mono/mono/mono/metadata/icall.c

[mono-list@spam.24.odessa.ua]

Errors while compiling files in subj

bash-2.03# gcc --version
2.95.3
bash-2.03# uname -a
SunOS tigger 5.8 Generic_117351-03 i86pc i386 i86pc

Files must be C - not a C++

Attached is a tiny fix.

Simly moved declarations of variables to make source code valid C. 

cvs server: Diffing mono/dis
Index: mono/dis/main.c
===================================================================
RCS file: /mono/mono/mono/dis/main.c,v
retrieving revision 1.120
diff -u -r1.120 main.c
--- mono/dis/main.c     24 Sep 2004 15:13:42 -0000      1.120
+++ mono/dis/main.c     26 Sep 2004 22:54:43 -0000
@@ -176,9 +176,10 @@
                return;
 
        for (i = 0; i < t->rows; i++){
+                char *esc;
                mono_metadata_decode_row (t, i, cols, MONO_ASSEMBLYREF_SIZE);
 
-               char *esc = get_escaped_name (mono_metadata_string_heap (m, cols [MONO_ASSEMBLYREF_NAME]));
+               esc = get_escaped_name (mono_metadata_string_heap (m, cols [MONO_ASSEMBLYREF_NAME]));
 
                fprintf (output,
                         ".assembly extern %s\n"
cvs server: Diffing mono/handles
cvs server: Diffing mono/interpreter
cvs server: Diffing mono/io-layer
cvs server: Diffing mono/jit
cvs server: Diffing mono/metadata
Index: mono/metadata/icall.c
===================================================================
RCS file: /mono/mono/mono/metadata/icall.c,v
retrieving revision 1.546
diff -u -r1.546 icall.c
--- mono/metadata/icall.c       26 Sep 2004 17:11:39 -0000      1.546
+++ mono/metadata/icall.c       26 Sep 2004 22:55:03 -0000
@@ -2380,6 +2380,8 @@
        if (m->klass == mono_defaults.object_class) {
 
                if (!strcmp (m->name, "FieldGetter")) {
+                       MonoString *name;
+                       char *str;
                        MonoClass *k = this->vtable->klass;
 
                        /* If this is a proxy, then it must be a CBO */
@@ -2390,8 +2392,7 @@
                                k = this->vtable->klass;
                        }
 
-                       MonoString *name = mono_array_get (params, MonoString *, 1);
-                       char *str;
+                       name = mono_array_get (params, MonoString*, 1);
 
                        str = mono_string_to_utf8 (name);
 
@@ -2421,6 +2422,9 @@
                        g_assert_not_reached ();
 
                } else if (!strcmp (m->name, "FieldSetter")) {
+                       int size, align;
+                       char *str;
+                       MonoString *name;
                        MonoClass *k = this->vtable->klass;
 
                        /* If this is a proxy, then it must be a CBO */
@@ -2430,10 +2434,9 @@
                                g_assert (this);
                                k = this->vtable->klass;
                        }
+
 
-                       MonoString *name = mono_array_get (params, MonoString *, 1);
-                       int size, align;
-                       char *str;
+                       name = mono_array_get (params, MonoString*, 1);
 
                        str = mono_string_to_utf8 (name);
 
@@ -2463,7 +2466,7 @@
 
                        g_free (str);
                        g_assert_not_reached ();
-
+}
                }
        }
 
cvs server: Diffing mono/mini


Thanks in advance,
--
Andriy G. Tereshchenko
Odessa, Ukraine