Fix spurious variable declaration with unknown macro and using#4698

danmar merged 4 commits intocppcheck-opensource:maincppcheck-opensource/cppcheck:mainfrom

chrchr-github:chr_VarDeclchrchr-github/cppcheck:chr_VarDeclCopy head branch name to clipboard