[dotgnu-pnet-commits] pnet ChangeLog csdoc/doc_valil.c engine/lib_str...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      08/02/03 09:52:49

Modified files:
        .              : ChangeLog 
        csdoc          : doc_valil.c 
        engine         : lib_string.c 

Log message:
        Make pnet compile with gcc2 (patch by Andreas Färber).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3532&r2=1.3533
http://cvs.savannah.gnu.org/viewcvs/pnet/csdoc/doc_valil.c?cvsroot=dotgnu-pnet&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pnet/engine/lib_string.c?cvsroot=dotgnu-pnet&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3532
retrieving revision 1.3533
diff -u -b -r1.3532 -r1.3533
--- ChangeLog   6 Jan 2008 21:40:05 -0000       1.3532
+++ ChangeLog   3 Feb 2008 09:52:48 -0000       1.3533
@@ -1,3 +1,10 @@
+2008-02-03  Andreas Färber  <address@hidden>
+
+       * csdoc/doc_valil.c, engine/lib_string.c: Move variable declarations
+       before any non variable declaration statements for gcc2 and ANSI C
+       compliance in GetClassNameInner and WithTypeToNameInner (doc_valil.c)
+       and _IL_String_FindInRange (lib_string.c).
+
 2008-01-06  Klaus Treichel  <address@hidden>
 
        * engine/jitc_array.c: Rename GetArrayBase to _ILJitSArrayGetBase and

Index: csdoc/doc_valil.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csdoc/doc_valil.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- csdoc/doc_valil.c   12 Nov 2007 19:06:47 -0000      1.13
+++ csdoc/doc_valil.c   3 Feb 2008 09:52:48 -0000       1.14
@@ -223,9 +223,9 @@
 
        if(nestedParent)
        {
-               name = GetClassNameInner(nestedParent, firstGenParam);
                char *tempName;
 
+               name = GetClassNameInner(nestedParent, firstGenParam);
                tempName = (char *)ILMalloc(strlen(name) +
                                                                        
strlen(ILClass_Name(classInfo)) + 2);
                if(!tempName)
@@ -826,10 +826,10 @@
 
        if(nestedParent)
        {
-               name = WithTypeToNameInner(nestedParent, shortForm, scope, 
first,
-                                                                  withType);
                char *tempName;
 
+               name = WithTypeToNameInner(nestedParent, shortForm, scope, 
first,
+                                                                  withType);
                tempName = (char *)ILMalloc(strlen(name) +
                                                                        
strlen(ILClass_Name(classInfo)) + 2);
                if(!tempName)

Index: engine/lib_string.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_string.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- engine/lib_string.c 17 May 2007 09:45:03 -0000      1.41
+++ engine/lib_string.c 3 Feb 2008 09:52:48 -0000       1.42
@@ -1031,12 +1031,16 @@
                                                           ILInt32 srcFirst, 
ILInt32 srcLast,
                                                           ILInt32 step, 
System_String *dest)
 {
+       ILUInt16 *buf1;
+       ILUInt16 *buf2;
+       ILUInt32 size;
+
        /* Searches for zero length strings always match */
        if(dest->length == 0)
                return srcFirst;
-       ILUInt16 *buf1 = StringToBuffer(_this) + srcFirst;
-       ILUInt16 *buf2 = StringToBuffer(dest);
-       ILUInt32 size = (ILUInt32)(dest->length * sizeof(ILUInt16));
+       buf1 = StringToBuffer(_this) + srcFirst;
+       buf2 = StringToBuffer(dest);
+       size = (ILUInt32)(dest->length * sizeof(ILUInt16));
        if(step > 0)
        {
                /* Scan forwards for the string */