Merge from gnulib, for extern-inline.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 21d1d25d6de967c0461e7d02bb3ece427d8aa401..715c6abd5b0fb98efca5cb1e8fb733b13698d585 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-08-02  Paul Eggert  <eggert@cs.ucla.edu>
 
+       Merge from gnulib (Bug#12116), incorporating:
+       2012-08-01 extern-inline: new module
+       2012-08-01 stat-time, timespec, u64, utimens: use extern-inline
+       * lib/stat-time.c, lib/utimespec.c, lib/u64.c, m4/extern-inline.m4:
+       New files.  The new .c files are for instantiating extern inline
+       functions.
+
        Port to Solaris 8.
        Without this change, 'configure' fails because the recently-added
        wait3 prototype in config.h messes up later 'configure' tests.