* intervals.h (CHECK_TOTAL_LENGTH): Avoid empty "else".

diff --git a/src/ChangeLog b/src/ChangeLog
index 576bbf5015768e2a109a5097d9bfb3a65daf8a01..89e054f62b0931fff0f9b91f8de8ea959a1c127b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * intervals.h (CHECK_TOTAL_LENGTH): Avoid empty "else".
+
        * atimer.c (start_atimer, append_atimer_lists, set_alarm): Rename
        locals to avoid shadowing.
 

diff --git a/src/intervals.h b/src/intervals.h
index f6c1c002ce036e2bff441182b986570a9143d8bc..d7c34012e1f713648e23cf77b232760366a8f56e 100644 (file)
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -161,8 +161,13 @@ struct interval
    (INTERVAL_HAS_PARENT (i) ? INTERVAL_PARENT (i) : 0)
 
 /* Abort if interval I's size is negative.  */
-#define CHECK_TOTAL_LENGTH(i) \
-  if ((int) (i)->total_length < 0) abort (); else
+#define CHECK_TOTAL_LENGTH(i)         \
+  do                                  \
+    {                                 \
+      if ((int) (i)->total_length < 0) \
+       abort ();                      \
+    }                                 \
+  while (0)
 
 /* Reset this interval to its vanilla, or no-property state. */
 #define RESET_INTERVAL(i) \
@@ -339,4 +344,3 @@ extern Lisp_Object get_pos_property (Lisp_Object pos, Lisp_Object prop,
 extern void syms_of_textprop (void);
 
 #include "composite.h"
-