From de32691b4e1869c84bd8e078cd2ac964e38db070 Mon Sep 17 00:00:00 2001
From: Gregory Hainaut <gregory.hainaut@gmail.com>
Date: Mon, 22 Aug 2016 18:21:17 +0200
Subject: [PATCH] clang format: don't allow statement on single lines + disable
 resource.h too (generated file)

Following discussion in #1530
---
 .clang-format                 | 6 +++---
 linux_various/check_format.sh | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

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/" | \