From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 24 Aug 2020 07:23:06 +0000 (+0200)
Subject: Explicitly configure new clang-format-11 options
X-Git-Tag: v9.16.11~19^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=504969cb638e868888fedaaefbff63a435051198;p=thirdparty%2Fbind9.git

Explicitly configure new clang-format-11 options

(cherry picked from commit 6c28834354e96890235addf13913fe02956fa78a)
---

diff --git a/.clang-format b/.clang-format
index 3ed176aeb7a..7137d8e0085 100644
--- a/.clang-format
+++ b/.clang-format
@@ -11,6 +11,7 @@ BraceWrapping:
   AfterFunction:   false # should also be MultiLine, but not yet supported
   AfterExternBlock: false
   BeforeElse:      false
+  BeforeWhile:     false
   IndentBraces:    false
   SplitEmptyFunction: true
 AllowShortIfStatementsOnASingleLine: false
@@ -19,6 +20,7 @@ AlwaysBreakAfterReturnType: All
 Cpp11BracedListStyle: false
 ColumnLimit: 80
 AlignAfterOpenBracket: Align
+AlignConsecutiveBitFields: true
 AlignConsecutiveDeclarations: false
 AlignConsecutiveMacros: true
 AlignTrailingComments: true
@@ -62,6 +64,7 @@ IncludeCategories:
     Priority:        1
   - Regex:           '.*'
     Priority:        0
+IndentExternBlock: NoIndent
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30
diff --git a/.clang-format.headers b/.clang-format.headers
index a488e811f4d..b536276e7ce 100644
--- a/.clang-format.headers
+++ b/.clang-format.headers
@@ -11,6 +11,7 @@ BraceWrapping:
   AfterFunction:   false # should also be MultiLine, but not yet supported
   AfterExternBlock: false
   BeforeElse:      false
+  BeforeWhile:     false
   IndentBraces:    false
   SplitEmptyFunction: true
 AllowShortIfStatementsOnASingleLine: false
@@ -19,6 +20,7 @@ AlwaysBreakAfterReturnType: All
 Cpp11BracedListStyle: false
 ColumnLimit: 80
 AlignAfterOpenBracket: Align
+AlignConsecutiveBitFields: true
 AlignConsecutiveDeclarations: true
 AlignConsecutiveMacros: true
 AlignTrailingComments: true
@@ -50,6 +52,7 @@ IncludeCategories:
     Priority:        1
   - Regex:           '".*"'
     Priority:        9
+IndentExternBlock: NoIndent
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30