summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-05-29 18:12:12 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-05-29 18:12:12 -0700
commit90856fe0b82ba19d1c3d73a4ba48007380201e66 (patch)
tree1b41ea9c212d3e7c1da29d03acc155a177db6c7c /ChangeLog
parent55d4c1b248e84d347ae73278faff623741f52691 (diff)
parentca3cf0a561302e2a94eb0ab24063e29580a97fe1 (diff)
downloademacs-90856fe0b82ba19d1c3d73a4ba48007380201e66.tar.gz
Merge from trunk.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab31d008d53..731d810b7c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
-2011-05-28 Paul Eggert <eggert@cs.ucla.edu>
+2011-05-30 Paul Eggert <eggert@cs.ucla.edu>
Use 'inline', not 'INLINE'.
* configure.in, autogen/config.in (INLINE): Remove.
+2011-05-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ Adjust to recent gnulib change for @GUARD_PREFIX@.
+ * lib/makefile.w32-in (getopt_h): Substitute @GUARD_PREFIX@, too.
+ All uses of _GL_ for guard prefixes in lib/*.h replaced with
+ _@GUARD_PREFIX@_.
+
2011-05-27 Paul Eggert <eggert@cs.ucla.edu>
* doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.