[dotgnu-pnet-commits] pnet ChangeLog cscc/common/cc_preproc.c cscc/co...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      07/06/01 16:47:15

Modified files:
        .              : ChangeLog 
        cscc/common    : cc_preproc.c cc_preproc.h 

Log message:
        Undo previous changes in cc_preproc.c and make bitfields in cc_preproc.h
        unsigned to fix preprocessor built with gcc 4.2.0.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3466&r2=1.3467
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/common/cc_preproc.c?cvsroot=dotgnu-pnet&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/common/cc_preproc.h?cvsroot=dotgnu-pnet&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3466
retrieving revision 1.3467
diff -u -b -r1.3466 -r1.3467
--- ChangeLog   1 Jun 2007 11:08:50 -0000       1.3466
+++ ChangeLog   1 Jun 2007 16:47:14 -0000       1.3467
@@ -1,5 +1,10 @@
 2007-06-01  Klaus Treichel  <address@hidden>
 
+       * cscc/common/cc_preproc.c, cscc/common/cc_preproc.h: Undo the changes
+       in cc_preproc.c and make the bitfields in cc_preproc.h unsigned instead.
+
+2007-06-01  Klaus Treichel  <address@hidden>
+
        * image/java_loader.c, image/member.c, image/meta_writer.c,
        image/pecoff_loader.c: Fix more signed bitfield assignments for gcc 
4.2.0.
 

Index: cscc/common/cc_preproc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/common/cc_preproc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cscc/common/cc_preproc.c    1 Jun 2007 11:08:51 -0000       1.7
+++ cscc/common/cc_preproc.c    1 Jun 2007 16:47:15 -0000       1.8
@@ -1171,7 +1171,7 @@
                                scope = (CCPreProcScope 
*)ILMalloc(sizeof(CCPreProcScope));
                                if(scope)
                                {
-                                       scope->active = cond ? -1 : 0;
+                                       scope->active = cond;
                                        scope->previous = 0;
                                        if(preproc->currentScope)
                                        {
@@ -1180,7 +1180,7 @@
                                        }
                                        else
                                        {
-                                               scope->ancestor = -1;
+                                               scope->ancestor = 1;
                                        }
                                        scope->sawElse = 0;
                                        scope->number = lines[line].number;
@@ -1209,7 +1209,7 @@
                                        }
                                        else
                                        {
-                                               preproc->currentScope->active = 
cond ? -1 : 0;
+                                               preproc->currentScope->active = 
cond;
                                        }
                                        if(preproc->currentScope->sawElse)
                                        {
@@ -1238,14 +1238,14 @@
                                        }
                                        else
                                        {
-                                               preproc->currentScope->active = 
-1;
+                                               preproc->currentScope->active = 
1;
                                        }
                                        if(preproc->currentScope->sawElse)
                                        {
                                                Message(&(lines[line]), 
_("#else used after #else"), 0);
                                                preproc->error = 1;
                                        }
-                                       preproc->currentScope->sawElse = -1;
+                                       preproc->currentScope->sawElse = 1;
                                }
                                else
                                {

Index: cscc/common/cc_preproc.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/common/cc_preproc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cscc/common/cc_preproc.h    5 May 2007 15:56:41 -0000       1.3
+++ cscc/common/cc_preproc.h    1 Jun 2007 16:47:15 -0000       1.4
@@ -56,10 +56,10 @@
  */
 typedef struct _tagCCPreProcScope
 {
-       int                                     active : 1;             /* 
Actively including this scope */
-       int                                     previous : 1;   /* Previous 
branch already taken */
-       int                                     ancestor : 1;   /* Ancestor is 
actively including */
-       int                                     sawElse : 1;    /* Already seen 
'#else' */
+       unsigned                        active : 1;             /* Actively 
including this scope */
+       unsigned                        previous : 1;   /* Previous branch 
already taken */
+       unsigned                        ancestor : 1;   /* Ancestor is actively 
including */
+       unsigned                        sawElse : 1;    /* Already seen '#else' 
*/
        unsigned long           number;                 /* Line number of the 
'#if' */
        const char                 *filename;           /* Filename of the 
'#if' */
        struct _tagCCPreProcScope *next;        /* Next outer scope level */