aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-15 18:42:03 -0700
committerPaul Eggert2011-04-15 18:42:03 -0700
commit9ac71959cbb35dd0e24001ea11e2d89db08f099c (patch)
treeadbe9e9b63eab28857cac1b26a18fbe93452fb6a
parent4d511c40f437adec6b8a635fe717605c1354f49c (diff)
downloademacs-9ac71959cbb35dd0e24001ea11e2d89db08f099c.tar.gz
emacs-9ac71959cbb35dd0e24001ea11e2d89db08f099c.zip
* lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".
-rw-r--r--lwlib/ChangeLog2
-rw-r--r--lwlib/lwlib.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index d6a76a96471..cea02d79993 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,5 +1,7 @@
12011-04-16 Paul Eggert <eggert@cs.ucla.edu> 12011-04-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".
4
3 * lwlib-utils.h, lwlib-utils.c (XtSafelyDestroyWidget): Remove; unused. 5 * lwlib-utils.h, lwlib-utils.c (XtSafelyDestroyWidget): Remove; unused.
4 6
5 * xlwmenu.c (XlwMenuSetValues): Rename/ move locals to avoid shadowing. 7 * 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)
422 (nc == STRUCTURAL_CHANGE ? "structural" : "???")))), \ 422 (nc == STRUCTURAL_CHANGE ? "structural" : "???")))), \
423 nc, desc, a1, a2) 423 nc, desc, a1, a2)
424#else 424#else
425# define EXPLAIN(name, oc, nc, desc, a1, a2) 425# define EXPLAIN(name, oc, nc, desc, a1, a2) ((void) 0)
426#endif 426#endif
427 427
428 428
@@ -912,8 +912,9 @@ destroy_one_instance (widget_instance *instance)
912 xaw_destroy_instance (instance); 912 xaw_destroy_instance (instance);
913 else 913 else
914#endif 914#endif
915 /* do not remove the empty statement */ 915 {
916 ; 916 /* Empty compound statement to terminate if-then-else chain. */
917 }
917 } 918 }
918 919
919 free_widget_instance (instance); 920 free_widget_instance (instance);