diff --git a/.clang-format b/.clang-format
index 6da69c034d7..de4f8b8e95c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -58,12 +58,8 @@ IndentCaseLabels: true
 IndentGotoLabels: false
 #llvm11: IndentExternBlock: AfterExternBlock
 #llvm11: InsertTrailingCommas: None
-MacroBlockBegin:
-  - "^_BEFORE_USER_CB"
-  - "^_PAUSE_ERRORS"
-MacroBlockEnd:
-  - "^_AFTER_USER_CB"
-  - "^_RESUME_ERRORS"
+MacroBlockBegin: "^H5_BEFORE_USER_CB*|^H5E_PAUSE_ERRORS"
+MacroBlockEnd: "^H5_AFTER_USER_CB*|^H5E_RESUME_ERRORS"
 ObjCBlockIndentWidth: 4
 #llvm11: ObjCBreakBeforeNestedBlockParam: true
 ReflowComments:  true