*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 020dbc127752dfd7af5c405443c842c49c8b61f5..8c1d08fbe451a1611e637bbe307308617992117d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-05  Dave Love  <fx@gnu.org>
+
+       * configure.in: Check for memcpy, mempcpy, mblen, mbrlen.  Use
+       AC_FUNC_STRFTIME, AC_STRUCT_TIMEZONE, AC_TYPE_MBSTATE_T.
+       (NLIST_STRUCT): Don't define.
+
 2003-06-02  Richard M. Stallman  <rms@gnu.org>
 
        * configure.in: Revert changes of 2003-03-03 and 2003-05-24.

diff --git a/src/ChangeLog b/src/ChangeLog
index ade221020993ea100a849ea3d88b3cd41d7bcbb6..1713b57f14659ee1dda5cd3c92fdc286224c1c30 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2003-06-05  Dave Love  <fx@gnu.org>
+
+       * mktime.c (__mktime_internal): Merge changes from gnulib
+       involving year 69 and dst2.
+
+       Changes to merge with gnulib version and be consistent with the
+       autoconf test:
+
+       * getloadavg.c: Set NLIST_STRUCT from HAVE_NLIST_H.  Use
+       HAVE_STRUCT_NLIST_N_UN_N_NAME, not NLIST_NAME_UNION.
+       [HAVE_LOCALE_H]: Include locale.h.
+       (getloadavg) [HAVE_SETLOCALE]: Run sscanf in C locale.
+
 2003-06-05  Kim F. Storm  <storm@cua.dk>
 
        * window.c (coordinates_in_window): Convert X and Y to window