aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorPaul Eggert2011-05-28 15:39:39 -0700
committerPaul Eggert2011-05-28 15:39:39 -0700
commit55d4c1b248e84d347ae73278faff623741f52691 (patch)
treeabc6d768607b08bbf51eeb7a12cb693c4660db13 /src/coding.c
parent4ac619f07bc6d7560a04f5aa505c6ef084975d93 (diff)
downloademacs-55d4c1b248e84d347ae73278faff623741f52691.tar.gz
emacs-55d4c1b248e84d347ae73278faff623741f52691.zip
[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.c18
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 *);
864static Lisp_Object get_translation_table (Lisp_Object, int, int *); 864static Lisp_Object get_translation_table (Lisp_Object, int, int *);
865static Lisp_Object get_translation (Lisp_Object, int *, int *); 865static Lisp_Object get_translation (Lisp_Object, int *, int *);
866static int produce_chars (struct coding_system *, Lisp_Object, int); 866static int produce_chars (struct coding_system *, Lisp_Object, int);
867static INLINE void produce_charset (struct coding_system *, int *, 867static inline void produce_charset (struct coding_system *, int *,
868 EMACS_INT); 868 EMACS_INT);
869static void produce_annotation (struct coding_system *, EMACS_INT); 869static void produce_annotation (struct coding_system *, EMACS_INT);
870static int decode_coding (struct coding_system *); 870static int decode_coding (struct coding_system *);
871static INLINE int *handle_composition_annotation (EMACS_INT, EMACS_INT, 871static inline int *handle_composition_annotation (EMACS_INT, EMACS_INT,
872 struct coding_system *, 872 struct coding_system *,
873 int *, EMACS_INT *); 873 int *, EMACS_INT *);
874static INLINE int *handle_charset_annotation (EMACS_INT, EMACS_INT, 874static inline int *handle_charset_annotation (EMACS_INT, EMACS_INT,
875 struct coding_system *, 875 struct coding_system *,
876 int *, EMACS_INT *); 876 int *, EMACS_INT *);
877static void consume_chars (struct coding_system *, Lisp_Object, int); 877static void consume_chars (struct coding_system *, Lisp_Object, int);
878static int encode_coding (struct coding_system *); 878static int encode_coding (struct coding_system *);
879static Lisp_Object make_conversion_work_buffer (int); 879static Lisp_Object make_conversion_work_buffer (int);
880static Lisp_Object code_conversion_restore (Lisp_Object); 880static Lisp_Object code_conversion_restore (Lisp_Object);
881static INLINE int char_encodable_p (int, Lisp_Object); 881static inline int char_encodable_p (int, Lisp_Object);
882static Lisp_Object make_subsidiaries (Lisp_Object); 882static Lisp_Object make_subsidiaries (Lisp_Object);
883 883
884static void 884static void
@@ -6829,7 +6829,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
6829 [ -LENGTH ANNOTATION_MASK NCHARS NBYTES METHOD [ COMPONENTS... ] ] 6829 [ -LENGTH ANNOTATION_MASK NCHARS NBYTES METHOD [ COMPONENTS... ] ]
6830 */ 6830 */
6831 6831
6832static INLINE void 6832static inline void
6833produce_composition (struct coding_system *coding, int *charbuf, EMACS_INT pos) 6833produce_composition (struct coding_system *coding, int *charbuf, EMACS_INT pos)
6834{ 6834{
6835 int len; 6835 int len;
@@ -6873,7 +6873,7 @@ produce_composition (struct coding_system *coding, int *charbuf, EMACS_INT pos)
6873 [ -LENGTH ANNOTATION_MASK NCHARS CHARSET-ID ] 6873 [ -LENGTH ANNOTATION_MASK NCHARS CHARSET-ID ]
6874 */ 6874 */
6875 6875
6876static INLINE void 6876static inline void
6877produce_charset (struct coding_system *coding, int *charbuf, EMACS_INT pos) 6877produce_charset (struct coding_system *coding, int *charbuf, EMACS_INT pos)
6878{ 6878{
6879 EMACS_INT from = pos - charbuf[2]; 6879 EMACS_INT from = pos - charbuf[2];
@@ -7101,7 +7101,7 @@ decode_coding (struct coding_system *coding)
7101 position of a composition after POS (if any) or to LIMIT, and 7101 position of a composition after POS (if any) or to LIMIT, and
7102 return BUF. */ 7102 return BUF. */
7103 7103
7104static INLINE int * 7104static inline int *
7105handle_composition_annotation (EMACS_INT pos, EMACS_INT limit, 7105handle_composition_annotation (EMACS_INT pos, EMACS_INT limit,
7106 struct coding_system *coding, int *buf, 7106 struct coding_system *coding, int *buf,
7107 EMACS_INT *stop) 7107 EMACS_INT *stop)
@@ -7184,7 +7184,7 @@ handle_composition_annotation (EMACS_INT pos, EMACS_INT limit,
7184 If the property value is nil, set *STOP to the position where the 7184 If the property value is nil, set *STOP to the position where the
7185 property value is non-nil (limiting by LIMIT), and return BUF. */ 7185 property value is non-nil (limiting by LIMIT), and return BUF. */
7186 7186
7187static INLINE int * 7187static inline int *
7188handle_charset_annotation (EMACS_INT pos, EMACS_INT limit, 7188handle_charset_annotation (EMACS_INT pos, EMACS_INT limit,
7189 struct coding_system *coding, int *buf, 7189 struct coding_system *coding, int *buf,
7190 EMACS_INT *stop) 7190 EMACS_INT *stop)
@@ -8435,7 +8435,7 @@ highest priority. */)
8435} 8435}
8436 8436
8437 8437
8438static INLINE int 8438static inline int
8439char_encodable_p (int c, Lisp_Object attrs) 8439char_encodable_p (int c, Lisp_Object attrs)
8440{ 8440{
8441 Lisp_Object tail; 8441 Lisp_Object tail;