diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-10 13:37:43 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-10 13:37:43 +0400 |
| commit | 42b3a444365f6fdafb128971496bd2b48249f635 (patch) | |
| tree | db92762a5774b35c457b6904bed9702a95519184 | |
| parent | 9fb0c957319ac71aca7b668bd3ee781590f59b19 (diff) | |
| download | emacs-42b3a444365f6fdafb128971496bd2b48249f635.tar.gz | |
Use common inline syntax in intervals.h.
* intervals.h (INTERVALS_INLINE): New macro.
Change all users from LISP_INLINE.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/intervals.h | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ec53ff2a264..f6874ff9c19 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2012-08-10 Dmitry Antipov <dmantipov@yandex.ru> + Use common inline syntax in intervals.h. + * intervals.h (INTERVALS_INLINE): New macro. + Change all users from LISP_INLINE. + +2012-08-10 Dmitry Antipov <dmantipov@yandex.ru> + Define Qnone once for all platforms. * frame.c (Qnone): Define here. (syms_of_frame): DEFSYM it. diff --git a/src/intervals.h b/src/intervals.h index 754b33f2ab9..a5166c6376f 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -19,6 +19,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 @@ struct interval /* 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 @@ interval_set_object (INTERVAL i, Lisp_Object obj) 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 @@ interval_set_plist (INTERVAL i, Lisp_Object plist) /* 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; |