diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp index 227733e95..bfc68a027 100644 --- a/lib/preprocessor.cpp +++ b/lib/preprocessor.cpp @@ -1910,13 +1910,7 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath } else if (!fileOpened) { - // TODO: Fix the handling of system includes and then - // remove the "headerType == UserHeader" -#ifdef NDEBUG - if (headerType == UserHeader && _errorLogger && _settings && _settings->isEnabled("missingInclude")) -#else - if (_errorLogger && _settings && _settings->isEnabled("missingInclude")) -#endif + if (_errorLogger && _settings && ((headerType == UserHeader) && _settings->isEnabled("missingInclude") || _settings->debugwarnings)) { std::string f = filePath; diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs index 47440dd51..ed4e5098c 100644 --- a/win_installer/cppcheck.wxs +++ b/win_installer/cppcheck.wxs @@ -42,6 +42,7 @@ +