2 files changed, 7 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6717ce1489e..69d658eade2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
         * insdel.c (check_markers, make_gap_larger, make_gap_smaller):
         (reset_var_on_error, Fcombine_after_change_execute_1): Now static.
+        (CHECK_MARKERS): Redo to avoid gcc -Wempty-body diagnostic.
 
         * filelock.c (within_one_second): Now static.
         (lock_file_1): Rename local to avoid shadowing.
diff --git a/src/insdel.c b/src/insdel.c
index a429ae6a1e3..18495e6c903 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -70,9 +70,12 @@ Lisp_Object combine_after_change_buffer;
 Lisp_Object Qinhibit_modification_hooks;
 
 #define CHECK_MARKERS()                         \
-  if (check_markers_debug_flag)                 \
-    check_markers ();                           \
-  else
+  do                                            \
+    {                                           \
+      if (check_markers_debug_flag)             \
+        check_markers ();                       \
+    }                                           \
+  while (0)
 
 static void
 check_markers (void)