Workaround 'local variable obj_displ shadows outer symbol' cppcheck warning

(fix of commit 8d64dbd10)

* include/private/gc_pmark.h [MARK_BIT_PER_OBJ] (GC_push_contents_hdr):
Do not declare obj_displ if MARK_BIT_PER_GRANULE.

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index fa425cdd032b7374bb08abc4601b5a6c6ffca6ef..15e798605668889766a1b291df3ed2714a07fdfd 100644 (file)
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -317,7 +317,8 @@ GC_INLINE mse * GC_push_contents_hdr(ptr_t current, mse * mark_stack_top,
           if ((low_prod >> 16) != 0)
 #       endif /* MARK_BIT_PER_OBJ */
         {
-#         ifdef MARK_BIT_PER_OBJ
+#         if defined(MARK_BIT_PER_OBJ) \
+             && !defined(MARK_BIT_PER_GRANULE) /* for cppcheck */
             size_t obj_displ;
 
             /* Accurate enough if HBLKSIZE <= 2**15.    */