From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 01:42:03 +0000 (-0700)
Subject: * lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~54
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ac71959cbb35dd0e24001ea11e2d89db08f099c;p=emacs.git

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

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index d6a76a96471..cea02d79993 100644
--- 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 290ce091301..90461c0ba51 100644
--- 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);