diff --git a/.clang-format b/.clang-format index ba1c5c59c8..2f600e0c70 100644 --- a/.clang-format +++ b/.clang-format @@ -8,10 +8,10 @@ AlignEscapedNewlinesLeft: false AlignOperands: true AlignTrailingComments: true AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: true -AllowShortCaseLabelsOnASingleLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: true +AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None diff --git a/linux_various/check_format.sh b/linux_various/check_format.sh index 4ba79deb68..0dc9e54df8 100755 --- a/linux_various/check_format.sh +++ b/linux_various/check_format.sh @@ -44,6 +44,7 @@ files=`git diff $diff_range --name-only --diff-filter=ACMRT | \ grep -v "${1}plugins/zerospu2/" | \ grep -v "${1}plugins/zzogl-pg/" | \ \ + grep -v "/resource.h" | \ grep -v "3rdpary/" | \ grep -v "bin/" | \ grep -v "cmake/" | \