aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-03-14 18:25:31 -0700
committerPaul Eggert2011-03-14 18:25:31 -0700
commitf0cb4a607918c065ebedfd62eb0187b0d49f67d6 (patch)
treeda8769755db0aea558878e0d32aa0f74b678db4d
parent85876d07948fa6dba29b987c20eadd1b4c7aad1a (diff)
downloademacs-f0cb4a607918c065ebedfd62eb0187b0d49f67d6.tar.gz
emacs-f0cb4a607918c065ebedfd62eb0187b0d49f67d6.zip
* insdel.c (CHECK_MARKERS): Redo to avoid gcc -Wempty-body diagnostic.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/insdel.c9
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 @@
2 2
3 * insdel.c (check_markers, make_gap_larger, make_gap_smaller): 3 * insdel.c (check_markers, make_gap_larger, make_gap_smaller):
4 (reset_var_on_error, Fcombine_after_change_execute_1): Now static. 4 (reset_var_on_error, Fcombine_after_change_execute_1): Now static.
5 (CHECK_MARKERS): Redo to avoid gcc -Wempty-body diagnostic.
5 6
6 * filelock.c (within_one_second): Now static. 7 * filelock.c (within_one_second): Now static.
7 (lock_file_1): Rename local to avoid shadowing. 8 (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;
70Lisp_Object Qinhibit_modification_hooks; 70Lisp_Object Qinhibit_modification_hooks;
71 71
72#define CHECK_MARKERS() \ 72#define CHECK_MARKERS() \
73 if (check_markers_debug_flag) \ 73 do \
74 check_markers (); \ 74 { \
75 else 75 if (check_markers_debug_flag) \
76 check_markers (); \
77 } \
78 while (0)
76 79
77static void 80static void
78check_markers (void) 81check_markers (void)