(Qforeground_color, Qbackground_color): Declare.

[bpt/emacs.git] / src / strftime.c

diff --git a/src/strftime.c b/src/strftime.c
index 50aed8a..7ab41f0 100644 (file)
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -22,6 +22,11 @@
 # include <config.h>
 #endif
 
+/* Some hosts need this in order to declare localtime_r properly.  */
+#ifndef _REENTRANT
+# define _REENTRANT 1
+#endif
+
 #ifdef _LIBC
 # define HAVE_LIMITS_H 1
 # define HAVE_MBLEN 1
@@ -184,7 +189,7 @@ localtime_r (t, tp)
   return tp;
 }
 # endif /* ! HAVE_LOCALTIME_R */
-#endif /* ! defined (_LIBC) */
+#endif /* ! defined _LIBC */
 
 
 #if !defined memset && !defined HAVE_MEMSET && !defined _LIBC
@@ -204,7 +209,7 @@ static const char zeroes[16] = /* "0000000000000000" */
     do                                                                       \
       {                                                                              \
        int _this = _len > 16 ? 16 : _len;                                    \
-       (P) = mempcpy ((P), spaces, _this);                                   \
+       (P) = MEMPCPY ((P), spaces, _this);                                   \
        _len -= _this;                                                        \
       }                                                                              \
     while (_len > 0);                                                        \
@@ -217,7 +222,7 @@ static const char zeroes[16] = /* "0000000000000000" */
     do                                                                       \
       {                                                                              \
        int _this = _len > 16 ? 16 : _len;                                    \
-       (P) = mempcpy ((P), zeroes, _this);                                   \
+       (P) = MEMPCPY ((P), zeroes, _this);                                   \
        _len -= _this;                                                        \
       }                                                                              \
     while (_len > 0);                                                        \
@@ -372,14 +377,6 @@ static char const month_name[][10] =
 
 #ifdef emacs
 # define my_strftime emacs_strftime
- /* Emacs 20.2 uses `-Dstrftime=emacs_strftime' when compiling,
-    because that's how strftime used to be configured.
-    Undo this, since it gets in the way of accessing the underlying strftime,
-    which is needed for things like %Ec in Solaris.
-    The following two lines can be removed once Emacs stops compiling with
-    `-Dstrftime=emacs_strftime'.  */
-# undef strftime
-size_t strftime __P ((char *, size_t, const char *, const struct tm *));
 #else
 # define my_strftime strftime
 #endif
@@ -1170,14 +1167,14 @@ my_strftime (s, maxsize, format, tp)
                   valid time_t value.  Check whether an error really
                   occurred.  */
                struct tm tm;
-               localtime_r (&lt, &tm);
-
-               if ((ltm.tm_sec ^ tm.tm_sec)
-                   | (ltm.tm_min ^ tm.tm_min)
-                   | (ltm.tm_hour ^ tm.tm_hour)
-                   | (ltm.tm_mday ^ tm.tm_mday)
-                   | (ltm.tm_mon ^ tm.tm_mon)
-                   | (ltm.tm_year ^ tm.tm_year))
+
+               if (! localtime_r (&lt, &tm)
+                   || ((ltm.tm_sec ^ tm.tm_sec)
+                       | (ltm.tm_min ^ tm.tm_min)
+                       | (ltm.tm_hour ^ tm.tm_hour)
+                       | (ltm.tm_mday ^ tm.tm_mday)
+                       | (ltm.tm_mon ^ tm.tm_mon)
+                       | (ltm.tm_year ^ tm.tm_year)))
                  break;
              }