X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrftime.c;h=4ca2ffa4fb828c13bfd97f076ae1c4ef2c47f65e;hb=e29e19dce9e19be76fae92b0955d02c843333093;hp=7f06d6fda24d6a89090b1b4f3b482a7966845907;hpb=119ae5514681e42839f83a4993021a222ec45daa;p=gnulib.git

diff --git a/lib/strftime.c b/lib/strftime.c
index 7f06d6fda..4ca2ffa4f 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -27,11 +27,11 @@
 #else
 # include <config.h>
 # if FPRINTFTIME
+#  include "ignore-value.h"
 #  include "fprintftime.h"
 # else
 #  include "strftime.h"
 # endif
-# include "ignore-value.h"
 #endif
 
 #include <ctype.h>
@@ -199,6 +199,8 @@ extern char *tzname[];
 #if FPRINTFTIME
 # define cpy(n, s) \
     add ((n),								      \
+     do									      \
+       {								      \
 	 if (to_lowcase)						      \
 	   fwrite_lowcase (p, (s), _n);					      \
 	 else if (to_uppcase)						      \
@@ -211,8 +213,11 @@ extern char *tzname[];
 		is intended to be consistent with the one from ISO C,         \
 		which permits failure due to ENOMEM *without* setting the     \
 		stream's error indicator.  */                                 \
-	     ignore_value (fwrite ((s), _n, 1, p)));			      \
-	   }
+	     ignore_value (fwrite ((s), _n, 1, p));                           \
+	   }								      \
+       }								      \
+     while (0)								      \
+    )
 #else
 # define cpy(n, s)							      \
     add ((n),								      \