aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2011-05-30 22:34:40 -0700
committerPaul Eggert2011-05-30 22:34:40 -0700
commiteefc9486e823512a4c1928b6264c5a1ce9142624 (patch)
tree9a461071564c5a60a2531fc056bda525101bd2e0 /lib-src
parent738db17859465a4adaaf1d43bbb1d1eed307e712 (diff)
parentaa1a7eb834c4671e3c49a97d72ca7e03f2a840a2 (diff)
downloademacs-eefc9486e823512a4c1928b6264c5a1ce9142624.tar.gz
emacs-eefc9486e823512a4c1928b6264c5a1ce9142624.zip
Use 'inline', not 'INLINE'.
[ChangeLog] * configure.in (INLINE): Remove. [lib-src/ChangeLog] * etags.c (hash): Now inline unconditionally. * make-docfile.c (put_char): inline, not INLINE. [nt/ChangeLog] * config.nt (INLINE): Remove. [src/ChangeLog] <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html> * alloc.c, fontset.c (INLINE): Remove. * alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c: * intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c: * xdisp.c, xfaces.c, xterm.c: Replace all uses of INLINE with inline. * gmalloc.c (register_heapinfo): Use inline unconditionally. * lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/etags.c9
-rw-r--r--lib-src/make-docfile.c2
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 @@
12011-05-28 Paul Eggert <eggert@cs.ucla.edu>
2
3 Use 'inline', not 'INLINE'.
4 * etags.c (hash): Now inline unconditionally.
5 * make-docfile.c (put_char): inline, not INLINE.
6
12011-05-25 Glenn Morris <rgm@gnu.org> 72011-05-25 Glenn Morris <rgm@gnu.org>
2 8
3 * Makefile.in (.c.o): Remove (every .o file has an explicit rule). 9 * 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:
2360struct C_stab_entry { const char *name; int c_ext; enum sym_type type; }; 2360struct C_stab_entry { const char *name; int c_ext; enum sym_type type; };
2361/* maximum key range = 33, duplicates = 0 */ 2361/* maximum key range = 33, duplicates = 0 */
2362 2362
2363#ifdef __GNUC__ 2363static inline unsigned int
2364__inline
2365#else
2366#ifdef __cplusplus
2367inline
2368#endif
2369#endif
2370static unsigned int
2371hash (register const char *str, register unsigned int len) 2364hash (register const char *str, register unsigned int len)
2372{ 2365{
2373 static unsigned char asso_values[] = 2366 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
291/* Output CH to the file or buffer in STATE. Any pending newlines or 291/* Output CH to the file or buffer in STATE. Any pending newlines or
292 spaces are output first. */ 292 spaces are output first. */
293 293
294static INLINE void 294static inline void
295put_char (int ch, struct rcsoc_state *state) 295put_char (int ch, struct rcsoc_state *state)
296{ 296{
297 int out_ch; 297 int out_ch;