From 715538cec36639dc0d44278d3f9db6d5cda9919f Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Oct 17 2020 10:14:46 +0000
Subject: update cppcheck cflags


---

diff --git a/xscreensaver.spec b/xscreensaver.spec
index 31e30de..c757ec7 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -710,13 +710,17 @@ make tests -C driver
 cd ..
 CPPCHECK_FLAGS=""
 CPPCHECK_FLAGS="$CPPCHECK_FLAGS --enable=all --std=c89 -U__STRICT_ANSI__"
-CPPCHECK_FLAGS="$CPPCHECK_FLAGS -I. -Iutils -Idriver -Ihacks -I$archdir -I$archdir/hacks/"
+CPPCHECK_FLAGS="$CPPCHECK_FLAGS -I. -Iutils -Iutils/images -Idriver -Ihacks"
+CPPCHECK_FLAGS="$CPPCHECK_FLAGS -I$archdir -I$archdir/driver -I$archdir/hacks"
+CPPCHECK_FLAGS="$CPPCHECK_FLAGS -I$archdir/hacks/glx"
 CPPCHECK_FLAGS="$CPPCHECK_FLAGS -I%{_includedir}"
 # find stddef.h
 GCC_HEADER_PATH=$(echo '#include <stddef.h>' | gcc -E - | sed -n -e 's|^.*"\(.*\)stddef\.h".*$|\1|p' | head -n 1)
 CPPCHECK_FLAGS="$CPPCHECK_FLAGS -I$GCC_HEADER_PATH"
 CPPCHECK_FLAGS="$CPPCHECK_FLAGS $(pkg-config --cflags gtk+-2.0 | sed -e 's|-pthread||')"
 CPPCHECK_FLAGS="$CPPCHECK_FLAGS -DSTANDALONE -DHAVE_CONFIG_H -DUSE_GL"
+# C default macros
+CPPCHECK_FLAGS="$CPPCHECK_FLAGS -D__STDC__"
 
 cppcheck $CPPCHECK_FLAGS . 2>&1 | tee cppcheck-result.log
 cppcheck $CPPCHECK_FLAGS --check-config . 2>&1 | tee cppcheck-path-inclusion-check.log