From 5f590a9d99b0958b2a86dba047abc6b066a3b344 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 2 Jan 2021 16:07:39 +0100
Subject: .clang-format: backport ClangFormat compat fixes

Cherry-picked and squashed from 2fed7f8a and 23cf8bec.
---
 .clang-format | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.clang-format b/.clang-format
index 7cc0f46e..4df5ae84 100644
--- a/.clang-format
+++ b/.clang-format
@@ -92,7 +92,7 @@ IncludeCategories:
 #IncludeIsMainRegex: '(_test)?$'
 #IncludeIsMainSourceRegex: ''
 #IndentCaseLabels: false
-IndentGotoLabels: false
+#IndentGotoLabels: false # Uncomment once on ClangFormat 10
 IndentPPDirectives: AfterHash
 #IndentWidth: 4
 #IndentWrappedFunctionNames: false
@@ -122,7 +122,7 @@ SortUsingDeclarations: false
 #SpaceBeforeInheritanceColon: true
 #SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyBlock: false
+#SpaceInEmptyBlock: false # Uncomment once on ClangFormat 10
 #SpaceInEmptyParentheses: false
 #SpacesBeforeTrailingComments: 1
 #SpacesInAngles:  false
-- 
cgit v1.2.3