Workaround cppcheck warnings regarding CLOCKS_PER_SEC, REDIRECT_REALLOC

Also, this commit adjusts the workaround for FIXUP_POINTER.

* include/private/gcconfig.h [CPPCHECK] (CLOCKS_PER_SEC, FIXUP_POINTER,
POINTER_MASK, POINTER_SHIFT, REDIRECT_REALLOC): Undefine.
* include/private/gcconfig.h [!FIXUP_POINTER && POINTER_MASK]
(FIXUP_POINTER): Same definition regardless of CPPCHECK.
This commit is contained in:
Ivan Maidanski
2018-11-14 11:02:01 +03:00
parent 208846413a
commit 85422f3fcd
+9 -5
View File
@@ -25,6 +25,14 @@
#ifndef GCCONFIG_H
#define GCCONFIG_H
#ifdef CPPCHECK
# undef CLOCKS_PER_SEC
# undef FIXUP_POINTER
# undef POINTER_MASK
# undef POINTER_SHIFT
# undef REDIRECT_REALLOC
#enfif
#ifndef PTR_T_DEFINED
typedef char * ptr_t;
# define PTR_T_DEFINED
@@ -3487,11 +3495,7 @@ EXTERN_C_BEGIN
#endif
#if !defined(FIXUP_POINTER) && defined(POINTER_MASK)
# if defined(CPPCHECK)
# define FIXUP_POINTER(p) (p = (p) << 4) /* e.g. */
# else
# define FIXUP_POINTER(p) (p = ((p) & POINTER_MASK) << POINTER_SHIFT)
# endif
# define FIXUP_POINTER(p) (p = ((p) & POINTER_MASK) << POINTER_SHIFT)
#endif
#if defined(FIXUP_POINTER)