Workaround 'identical expr on both sides of bitwise op' warning

* gcj_mlc.c (GC_init_gcj_malloc): Comment out "0 |" (in the expression
of "0 | GC_DS_LENGTH").
* mark.c (GC_obj_kinds, GC_push_marked, GC_push_unconditionally):
Likewise.

diff --git a/gcj_mlc.c b/gcj_mlc.c
index 195a215ae1227b2e39f7e0db65321c13c368e4c9..e3f076f4149c59fa5e2f8072391b6f5a97628078 100644 (file)
--- a/gcj_mlc.c
+++ b/gcj_mlc.c
@@ -101,7 +101,7 @@ GC_API void GC_CALL GC_init_gcj_malloc(int mp_index,
         /* Use a simple length-based descriptor, thus forcing a fully   */
         /* conservative scan.                                           */
         GC_gcj_kind = GC_new_kind_inner((void **)GC_gcjobjfreelist,
-                                        (0 | GC_DS_LENGTH),
+                                        /* 0 | */ GC_DS_LENGTH,
                                         TRUE, TRUE);
       } else {
         GC_gcj_kind = GC_new_kind_inner(

diff --git a/mark.c b/mark.c
index deac1b9598cc9393ab44ba5c62428911bd8fb699..128617e2a32c670aa91eee46d46231dbcb726189 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -48,23 +48,24 @@ GC_INNER unsigned GC_n_mark_procs = GC_RESERVED_MARK_PROCS;
 /* It's done here, since we need to deal with mark descriptors.         */
 GC_INNER struct obj_kind GC_obj_kinds[MAXOBJKINDS] = {
               { &GC_freelists[PTRFREE][0], 0 /* filled in dynamically */,
-                0 | GC_DS_LENGTH, FALSE, FALSE
+                /* 0 | */ GC_DS_LENGTH, FALSE, FALSE
                 /*, */ OK_DISCLAIM_INITZ },
               { &GC_freelists[NORMAL][0], 0,
-                0 | GC_DS_LENGTH,  /* Adjusted in GC_init for EXTRA_BYTES */
+                /* 0 | */ GC_DS_LENGTH,
+                                /* adjusted in GC_init for EXTRA_BYTES  */
                 TRUE /* add length to descr */, TRUE
                 /*, */ OK_DISCLAIM_INITZ },
               { &GC_freelists[UNCOLLECTABLE][0], 0,
-                0 | GC_DS_LENGTH, TRUE /* add length to descr */, TRUE
+                /* 0 | */ GC_DS_LENGTH, TRUE /* add length to descr */, TRUE
                 /*, */ OK_DISCLAIM_INITZ },
 # ifdef GC_ATOMIC_UNCOLLECTABLE
               { &GC_freelists[AUNCOLLECTABLE][0], 0,
-                0 | GC_DS_LENGTH, FALSE /* add length to descr */, FALSE
+                /* 0 | */ GC_DS_LENGTH, FALSE /* add length to descr */, FALSE
                 /*, */ OK_DISCLAIM_INITZ },
 # endif
 # ifdef STUBBORN_ALLOC
               { (void **)&GC_freelists[STUBBORN][0], 0,
-                0 | GC_DS_LENGTH, TRUE /* add length to descr */, TRUE
+                /* 0 | */ GC_DS_LENGTH, TRUE /* add length to descr */, TRUE
                 /*, */ OK_DISCLAIM_INITZ },
 # endif
 };
@@ -1751,7 +1752,7 @@ STATIC void GC_push_marked(struct hblk *h, hdr *hhdr)
     mse * mark_stack_limit = GC_mark_stack_limit;
 
     /* Some quick shortcuts: */
-        if ((0 | GC_DS_LENGTH) == descr) return;
+        if ((/* 0 | */ GC_DS_LENGTH) == descr) return;
         if (GC_block_empty(hhdr)/* nothing marked */) return;
     GC_n_rescuing_pages++;
     GC_objects_are_marked = TRUE;
@@ -1809,7 +1810,7 @@ STATIC void GC_push_marked(struct hblk *h, hdr *hhdr)
     mse * GC_mark_stack_top_reg;
     mse * mark_stack_limit = GC_mark_stack_limit;
 
-    if ((0 | GC_DS_LENGTH) == descr)
+    if ((/* 0 | */ GC_DS_LENGTH) == descr)
         return;
 
     GC_n_rescuing_pages++;