From: Jim Meyering <jim@meyering.net>
Date: Mon, 4 Oct 1993 21:07:56 +0000 (+0000)
Subject: GNU shell utilities
X-Git-Tag: SHELLUTILS-1_8_1c~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bf23a190055569fc0fd53fefac2336d7d0fc2b4;p=thirdparty%2Fgnulib.git

GNU shell utilities
---

diff --git a/lib/getdate.y b/lib/getdate.y
index cdc2b5565d..e5cf18a16b 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -14,8 +14,12 @@
 /* SUPPRESS 288 on yyerrlab *//* Label unused */
 
 #ifdef HAVE_CONFIG_H
+#if defined (emacs) || defined (CONFIG_BROKETS)
+#include <config.h>
+#else
 #include "config.h"
 #endif
+#endif
 
 /* Since the code of getdate.y is not included in the Emacs executable
    itself, there is no need to #define static in this file.  Even if
diff --git a/lib/strftime.c b/lib/strftime.c
index a075717507..cfd41adbee 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -104,7 +104,13 @@ static char const * const months[] =
 /* Add character C to STRING and increment LENGTH,
    unless LENGTH would exceed MAX. */
 
-#define add_char(c) (length + 1 <= max) && (string[length++] = (c))
+#define add_char(c)							\
+  do									\
+    {									\
+      if (length + 1 <= max)						\
+	string[length++] = (c);						\
+    }									\
+  while (0)
 
 /* Add a 2 digit number to STRING, padding if specified.
    Return the number of characters added, up to MAX. */