diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-28 15:39:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-28 15:39:39 -0700 |
| commit | 55d4c1b248e84d347ae73278faff623741f52691 (patch) | |
| tree | abc6d768607b08bbf51eeb7a12cb693c4660db13 /src/coding.c | |
| parent | 4ac619f07bc6d7560a04f5aa505c6ef084975d93 (diff) | |
| download | emacs-55d4c1b248e84d347ae73278faff623741f52691.tar.gz | |
[ChangeLog]
Use 'inline', not 'INLINE'.
* configure.in, autogen/config.in (INLINE): Remove.
[lib-src/ChangeLog]
Use 'inline', not 'INLINE'.
* etags.c (hash): Now inline unconditionally.
* make-docfile.c (put_char): inline, not INLINE.
[nt/ChangeLog]
Use 'inline', not 'INLINE'.
* config.nt (INLINE): Remove.
[src/ChangeLog]
Use 'inline', not 'INLINE'.
* 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 'src/coding.c')
| -rw-r--r-- | src/coding.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/coding.c b/src/coding.c index 71253df6469..e257790bbef 100644 --- a/src/coding.c +++ b/src/coding.c @@ -864,21 +864,21 @@ static void decode_eol (struct coding_system *); static Lisp_Object get_translation_table (Lisp_Object, int, int *); static Lisp_Object get_translation (Lisp_Object, int *, int *); static int produce_chars (struct coding_system *, Lisp_Object, int); -static INLINE void produce_charset (struct coding_system *, int *, +static inline void produce_charset (struct coding_system *, int *, EMACS_INT); static void produce_annotation (struct coding_system *, EMACS_INT); static int decode_coding (struct coding_system *); -static INLINE int *handle_composition_annotation (EMACS_INT, EMACS_INT, +static inline int *handle_composition_annotation (EMACS_INT, EMACS_INT, struct coding_system *, int *, EMACS_INT *); -static INLINE int *handle_charset_annotation (EMACS_INT, EMACS_INT, +static inline int *handle_charset_annotation (EMACS_INT, EMACS_INT, struct coding_system *, int *, EMACS_INT *); static void consume_chars (struct coding_system *, Lisp_Object, int); static int encode_coding (struct coding_system *); static Lisp_Object make_conversion_work_buffer (int); static Lisp_Object code_conversion_restore (Lisp_Object); -static INLINE int char_encodable_p (int, Lisp_Object); +static inline int char_encodable_p (int, Lisp_Object); static Lisp_Object make_subsidiaries (Lisp_Object); static void @@ -6829,7 +6829,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table, [ -LENGTH ANNOTATION_MASK NCHARS NBYTES METHOD [ COMPONENTS... ] ] */ -static INLINE void +static inline void produce_composition (struct coding_system *coding, int *charbuf, EMACS_INT pos) { int len; @@ -6873,7 +6873,7 @@ produce_composition (struct coding_system *coding, int *charbuf, EMACS_INT pos) [ -LENGTH ANNOTATION_MASK NCHARS CHARSET-ID ] */ -static INLINE void +static inline void produce_charset (struct coding_system *coding, int *charbuf, EMACS_INT pos) { EMACS_INT from = pos - charbuf[2]; @@ -7101,7 +7101,7 @@ decode_coding (struct coding_system *coding) position of a composition after POS (if any) or to LIMIT, and return BUF. */ -static INLINE int * +static inline int * handle_composition_annotation (EMACS_INT pos, EMACS_INT limit, struct coding_system *coding, int *buf, EMACS_INT *stop) @@ -7184,7 +7184,7 @@ handle_composition_annotation (EMACS_INT pos, EMACS_INT limit, If the property value is nil, set *STOP to the position where the property value is non-nil (limiting by LIMIT), and return BUF. */ -static INLINE int * +static inline int * handle_charset_annotation (EMACS_INT pos, EMACS_INT limit, struct coding_system *coding, int *buf, EMACS_INT *stop) @@ -8435,7 +8435,7 @@ highest priority. */) } -static INLINE int +static inline int char_encodable_p (int c, Lisp_Object attrs) { Lisp_Object tail; |