Workaround 'unused variable' cppcheck style warnings

* include/private/gc_locks.h [PCR && THREADS] (DCL_LOCK_STATE): Define
to empty if CPPCHECK.
* mach_dep.c [MACOS && __MWERKS__ && POWERPC] (getRegisters): Declare
as external of CPPCHECK (as cppcheck does not recognize "asm" in
function declaration).

diff --git a/include/private/gc_locks.h b/include/private/gc_locks.h
index 1359d1f1a87dc94fb0f0009eb8aa8382c8a2b8a1..38c7350750e32feb889bb0fdc91fec475cc7e354 100644 (file)
--- a/include/private/gc_locks.h
+++ b/include/private/gc_locks.h
@@ -36,8 +36,12 @@
 #    include <base/PCR_Base.h>
 #    include <th/PCR_Th.h>
      GC_EXTERN PCR_Th_ML GC_allocate_ml;
-#    define DCL_LOCK_STATE \
+#    if  defined(CPPCHECK)
+#      define DCL_LOCK_STATE /* empty */
+#    else
+#      define DCL_LOCK_STATE \
          PCR_ERes GC_fastLockRes; PCR_sigset_t GC_old_sig_mask
+#    endif
 #    define UNCOND_LOCK() PCR_Th_ML_Acquire(&GC_allocate_ml)
 #    define UNCOND_UNLOCK() PCR_Th_ML_Release(&GC_allocate_ml)
 #  endif

diff --git a/mach_dep.c b/mach_dep.c
index d76cc6353f4e3a0303dc3db23f2f82760405130f..61b5ed26e038373f5ca76e594e2782fdc6ff238f 100644 (file)
--- a/mach_dep.c
+++ b/mach_dep.c
@@ -34,11 +34,15 @@
   };
   typedef struct ppc_registers ppc_registers;
 
-  asm static void getRegisters(register ppc_registers* regs)
-  {
+# if defined(CPPCHECK)
+    void getRegisters(ppc_registers* regs);
+# else
+    asm static void getRegisters(register ppc_registers* regs)
+    {
         stmw    r13,regs->gprs                          /* save R13-R31 */
         blr
-  }
+    }
+# endif
 
   static void PushMacRegisters(void)
   {