summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1993-10-04 21:07:56 +0000
committerJim Meyering <jim@meyering.net>1993-10-04 21:07:56 +0000
commit7bf23a190055569fc0fd53fefac2336d7d0fc2b4 (patch)
treecccf9802c511d73ba63b9e7805576ecf0a5284b2
parent317f6a262e98366cc859bb5ca7bb7a79a9a20548 (diff)
downloadgnulib-7bf23a190055569fc0fd53fefac2336d7d0fc2b4.tar.gz
GNU shell utilities
-rw-r--r--lib/getdate.y4
-rw-r--r--lib/strftime.c8
2 files changed, 11 insertions, 1 deletions
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. */