* lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index d6a76a964717ddb879c78a143ac02cb1b9ca1fb2..cea02d7999374fb56c2a475a2e89a9ab4550536e 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".
+
        * lwlib-utils.h, lwlib-utils.c (XtSafelyDestroyWidget): Remove; unused.
 
        * xlwmenu.c (XlwMenuSetValues): Rename/ move locals to avoid shadowing.

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 290ce091301c181af5ae63685776f7a55cb0f579..90461c0ba51e1802e357800918347af7eb245abd 100644 (file)
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -422,7 +422,7 @@ safe_strcmp (const char *s1, const char *s2)
              (nc == STRUCTURAL_CHANGE ? "structural" : "???")))),      \
           nc, desc, a1, a2)
 #else
-# define EXPLAIN(name, oc, nc, desc, a1, a2)
+# define EXPLAIN(name, oc, nc, desc, a1, a2) ((void) 0)
 #endif
 
 
@@ -912,8 +912,9 @@ destroy_one_instance (widget_instance *instance)
        xaw_destroy_instance (instance);
       else
 #endif
-       /* do not remove the empty statement */
-       ;
+       {
+         /* Empty compound statement to terminate if-then-else chain.  */
+       }
     }
 
   free_widget_instance (instance);