[Emacs-diffs] /srv/bzr/emacs/trunk r109548: Use common inline syntax in intervals.h.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109548
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-10 13:37:43 +0400
message:
  Use common inline syntax in intervals.h.
  * intervals.h (INTERVALS_INLINE): New macro.
  Change all users from LISP_INLINE.
modified:
  src/ChangeLog
  src/intervals.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-10 09:24:03 +0000
+++ b/src/ChangeLog     2012-08-10 09:37:43 +0000
@@ -1,5 +1,11 @@
 2012-08-10  Dmitry Antipov  <address@hidden>
 
+       Use common inline syntax in intervals.h.
+       * intervals.h (INTERVALS_INLINE): New macro.
+       Change all users from LISP_INLINE.
+
+2012-08-10  Dmitry Antipov  <address@hidden>
+
        Define Qnone once for all platforms.
        * frame.c (Qnone): Define here.
        (syms_of_frame): DEFSYM it.

=== modified file 'src/intervals.h'
--- a/src/intervals.h   2012-08-10 09:04:19 +0000
+++ b/src/intervals.h   2012-08-10 09:37:43 +0000
@@ -19,6 +19,9 @@
 #include "dispextern.h"
 
 INLINE_HEADER_BEGIN
+#ifndef INTERVALS_INLINE
+# define INTERVALS_INLINE INLINE
+#endif
 
 /* Basic data type for use of intervals.  */
 
@@ -133,14 +136,14 @@
 /* Use these functions to set Lisp_Object
    or pointer slots of struct interval.  */
 
-LISP_INLINE void
+INTERVALS_INLINE void
 interval_set_parent (INTERVAL i, INTERVAL parent)
 {
   i->up_obj = 0;
   i->up.interval = parent;
 }
 
-LISP_INLINE void
+INTERVALS_INLINE void
 interval_set_object (INTERVAL i, Lisp_Object obj)
 {
   eassert (BUFFERP (obj) || STRINGP (obj));
@@ -148,19 +151,19 @@
   i->up.obj = obj;
 }
 
-LISP_INLINE void
+INTERVALS_INLINE void
 interval_set_left (INTERVAL i, INTERVAL left)
 {
   i->left = left;
 }
 
-LISP_INLINE void
+INTERVALS_INLINE void
 interval_set_right (INTERVAL i, INTERVAL right)
 {
   i->right = right;
 }
 
-LISP_INLINE Lisp_Object
+INTERVALS_INLINE Lisp_Object
 interval_set_plist (INTERVAL i, Lisp_Object plist)
 {
   i->plist = plist;
@@ -170,7 +173,7 @@
 /* Make the parent of D be whatever the parent of S is, regardless
    of the type.  This is used when balancing an interval tree.  */
 
-LISP_INLINE void
+INTERVALS_INLINE void
 interval_copy_parent (INTERVAL d, INTERVAL s)
 {
   d->up = s->up;