* signal.h (sig_save_enable, sig_save_disable):

Use do;while(0) trick instead of local typedef
to cause terminating semicolon to be required.
(sig_restore_enable, sig_restore_disable):
Remove superfluous do { } while (0).
Closing a brace is good enough.

2 files changed, 15 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7da255e5..6c6dfe9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-12  Kaz Kylheku  <kaz@kylheku.com>
+
+	* signal.h (sig_save_enable, sig_save_disable):
+	Use do;while(0) trick instead of local typedef
+	to cause terminating semicolon to be required.
+	(sig_restore_enable, sig_restore_disable):
+	Remove superfluous do { } while (0).
+	Closing a brace is good enough.
+
 2015-01-11  Kaz Kylheku  <kaz@kylheku.com>
 
 	* glob.c: New file.
diff --git a/signal.h b/signal.h
index 25a2765a..d01ac429 100644
--- a/signal.h
+++ b/signal.h
@@ -34,10 +34,9 @@
       sig_check();                              \
     async_sig_enabled = 1;                      \
     {                                           \
-      typedef void v_o_i_d
+      do ; while (0)
 
 #define sig_restore_enable                      \
-      do { } while (0);                         \
     }                                           \
     async_sig_enabled = sig_save;               \
   } while(0)
@@ -47,10 +46,9 @@
     int sig_save = async_sig_enabled;           \
     async_sig_enabled = 1;                      \
     {                                           \
-      typedef void v_o_i_d
+      do ; while (0)
 
 #define sig_restore_disable                     \
-      do { } while (0);                         \
     }                                           \
     async_sig_enabled = sig_save;               \
     if (sig_save)                               \
@@ -90,11 +88,11 @@ extern volatile sig_atomic_t async_sig_enabled;
 
 #else
 
-#define sig_save_enable do {
-#define sig_save_disable do {
+#define sig_save_enable do { do ; while (0)
+#define sig_save_disable do { do ; while (0)
 
-#define sig_restore_enable do { } while (0); } while (0)
-#define sig_restore_disable do { } while (0); } while (0)
+#define sig_restore_enable } while (0)
+#define sig_restore_disable } while (0)
 
 typedef struct {
   jmp_buf jb;