merge from trunk

this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now

1 files changed, 21 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e1025fc5f6b..4a43a741e54 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,22 @@
+2013-07-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Prefer plain 'static' to 'static inline' (Bug#12541).
+        I missed these instances of 'static inline' in an earlier sweep.
+        * ebrowse.c (putstr):
+        * etags.c (hash):
+        * make-docfile.c (put_char): No longer inline.
+        * etags.c (hash): Prefer int to unsigned when either will do.
+
+2013-06-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use C99-style flexible array members if available.
+        * ebrowse.c: Include <stddef.h>, for offsetof.
+        (struct member, struct alias, struct sym):
+        Use FLEXIBLE_ARRAY_MEMBER.
+        (add_sym, add_member, make_namespace, register_namespace_alias):
+        Use offsetof (struct, flex_array_member), not sizeof (struct), as
+        that ports better to pre-C99 non-GCC.
+
 2013-05-29  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (mostlyclean): Remove *.res files.
@@ -717,7 +736,7 @@
         to avoid potential buffer overflow issues on typical 64-bit hosts.
         (whatlen_max): New static var.
         (main): Avoid buffer overflow if subsidiary command length is
-        greater than BUFSIZ or 2*BUFSIZ + 20. Do not use sprintf when its
+        greater than BUFSIZ or 2*BUFSIZ + 20.  Do not use sprintf when its
         result might not fit in 'int'.
 
         * movemail.c (main): Do not use sprintf when its result might not fit
@@ -8408,7 +8427,7 @@
 
 1988-12-31  Richard Mlynarik  (mly@rice-chex.ai.mit.edu)
 
-        * env.c: Add decl for my-index
+        * env.c: Add decl for my-index.
         * etags.c (file-entries): .oak => scheme.
 
 1988-12-30  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)