aboutsummaryrefslogtreecommitdiffstats
path: root/src/intervals.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/intervals.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/intervals.c')
-rw-r--r--src/intervals.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/intervals.c b/src/intervals.c
index e72bc146d16..f9e9c864e13 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -313,7 +313,7 @@ root_interval (interval)
313 c c 313 c c
314*/ 314*/
315 315
316static INLINE INTERVAL 316static inline INTERVAL
317rotate_right (INTERVAL interval) 317rotate_right (INTERVAL interval)
318{ 318{
319 INTERVAL i; 319 INTERVAL i;
@@ -360,7 +360,7 @@ rotate_right (INTERVAL interval)
360 c c 360 c c
361*/ 361*/
362 362
363static INLINE INTERVAL 363static inline INTERVAL
364rotate_left (INTERVAL interval) 364rotate_left (INTERVAL interval)
365{ 365{
366 INTERVAL i; 366 INTERVAL i;
@@ -438,7 +438,7 @@ balance_an_interval (INTERVAL i)
438/* Balance INTERVAL, potentially stuffing it back into its parent 438/* Balance INTERVAL, potentially stuffing it back into its parent
439 Lisp Object. */ 439 Lisp Object. */
440 440
441static INLINE INTERVAL 441static inline INTERVAL
442balance_possible_root_interval (register INTERVAL interval) 442balance_possible_root_interval (register INTERVAL interval)
443{ 443{
444 Lisp_Object parent; 444 Lisp_Object parent;
@@ -1427,7 +1427,7 @@ adjust_intervals_for_deletion (struct buffer *buffer,
1427 at position START. Addition or deletion is indicated by the sign 1427 at position START. Addition or deletion is indicated by the sign
1428 of LENGTH. */ 1428 of LENGTH. */
1429 1429
1430INLINE void 1430inline void
1431offset_intervals (struct buffer *buffer, EMACS_INT start, EMACS_INT length) 1431offset_intervals (struct buffer *buffer, EMACS_INT start, EMACS_INT length)
1432{ 1432{
1433 if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) || length == 0) 1433 if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) || length == 0)
@@ -1883,7 +1883,7 @@ lookup_char_property (Lisp_Object plist, register Lisp_Object prop, int textprop
1883/* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to 1883/* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to
1884 byte position BYTEPOS. */ 1884 byte position BYTEPOS. */
1885 1885
1886INLINE void 1886inline void
1887temp_set_point_both (struct buffer *buffer, 1887temp_set_point_both (struct buffer *buffer,
1888 EMACS_INT charpos, EMACS_INT bytepos) 1888 EMACS_INT charpos, EMACS_INT bytepos)
1889{ 1889{
@@ -1903,7 +1903,7 @@ temp_set_point_both (struct buffer *buffer,
1903 1903
1904/* Set point "temporarily", without checking any text properties. */ 1904/* Set point "temporarily", without checking any text properties. */
1905 1905
1906INLINE void 1906inline void
1907temp_set_point (struct buffer *buffer, EMACS_INT charpos) 1907temp_set_point (struct buffer *buffer, EMACS_INT charpos)
1908{ 1908{
1909 temp_set_point_both (buffer, charpos, 1909 temp_set_point_both (buffer, charpos,
@@ -2392,7 +2392,7 @@ copy_intervals (INTERVAL tree, EMACS_INT start, EMACS_INT length)
2392 2392
2393/* Give STRING the properties of BUFFER from POSITION to LENGTH. */ 2393/* Give STRING the properties of BUFFER from POSITION to LENGTH. */
2394 2394
2395INLINE void 2395inline void
2396copy_intervals_to_string (Lisp_Object string, struct buffer *buffer, 2396copy_intervals_to_string (Lisp_Object string, struct buffer *buffer,
2397 EMACS_INT position, EMACS_INT length) 2397 EMACS_INT position, EMACS_INT length)
2398{ 2398{