Merge pull request 'master' (#295) from master into release

Reviewed-on: #295
2025-09-22 22:35:39 +03:00
parent a67b636db5 9bb63cdaf3
commit 306ae6f2b5
4 changed files with 4 additions and 4 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
-MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_FINISH|STATIC_INITIALIZER_END"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2