3 files changed, 8 insertions, 9 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f7ddd8f0eb2..62ab9a12d4f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use 'inline', not 'INLINE'.
+        * etags.c (hash): Now inline unconditionally.
+        * make-docfile.c (put_char): inline, not INLINE.
+
 2011-05-25  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (.c.o): Remove (every .o file has an explicit rule).
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 097f6842c07..693c999047f 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -2360,14 +2360,7 @@ and replace lines between %< and %> with its output, then:
 struct C_stab_entry { const char *name; int c_ext; enum sym_type type; };
 /* maximum key range = 33, duplicates = 0 */
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
+static inline unsigned int
 hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 9b804684a12..ba54202954b 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -291,7 +291,7 @@ struct rcsoc_state
 /* Output CH to the file or buffer in STATE.  Any pending newlines or
    spaces are output first.  */
 
-static INLINE void
+static inline void
 put_char (int ch, struct rcsoc_state *state)
 {
   int out_ch;