summaryrefslogtreecommitdiff
path: root/src/intervals.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-09-20 08:34:36 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-09-20 08:34:36 -0700
commit00382e8b9834e58203507d0461884671b78ebc01 (patch)
treecf28670199af0c1189cbcfbd14ffa49cbaaa0fba /src/intervals.h
parent2fd3a9f7491a59d427150fab0ad4df6ea12b3249 (diff)
downloademacs-00382e8b9834e58203507d0461884671b78ebc01.tar.gz
A simpler, centralized INLINE.
* lib-src/profile.c (INLINE): New macro. (SYSTIME_INLINE): Remove. * src/conf_post.h (INLINE): Define only if not already defined. This allows us to use a single INLINE, defined by one file per executable. * src/emacs.c (INLINE): Define it. Also, include category.h, charset.h, composite.h, dispextern.h, syntax.h, systime.h, so that their INLINE definitions are expanded properly for Emacs. * src/blockinput.h, src/keyboard.c (BLOCKINPUT_INLINE): * src/buffer.h, src/buffer.c (BUFFER_INLINE): * src/category.h, src/category.c (CATEGORY_INLINE): * src/character.h, src/character.c (CHARACTER_INLINE): * src/charset.h, src/charset.c (CHARSET_INLINE): * src/composite.h, src/composite.c (COMPOSITE_INLINE): * src/dispextern.h, src/dispnew.c (DISPEXTERN_INLINE): * src/frame.h, src/frame.c (FRAME_INLINE): * src/intervals.h, src/intervals.c (INTERVALS_INLINE): * src/keyboard.h, src/keyboard.c (KEYBOARD_INLINE): * src/lisp.h, src/alloc.c (LISP_INLINE): * src/process.h, src/process.c (PROCESS_INLINE): * src/syntax.h, src/syntax.c (SYNTAX_INLINE): * src/systime.h, src/sysdep.c (SYSTIME_INLINE): * src/termhooks.h, src/terminal.h (TERMHOOKS_INLINE): * src/window.h, src/window.c (WINDOW_INLINE): Remove. All uses replaced with INLINE.
Diffstat (limited to 'src/intervals.h')
-rw-r--r--src/intervals.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/intervals.h b/src/intervals.h
index a38e83cf10e..51dfa09c5c4 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -19,9 +19,6 @@ 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. */
@@ -136,14 +133,14 @@ struct interval
/* Use these functions to set Lisp_Object
or pointer slots of struct interval. */
-INTERVALS_INLINE void
+INLINE void
set_interval_parent (INTERVAL i, INTERVAL parent)
{
i->up_obj = 0;
i->up.interval = parent;
}
-INTERVALS_INLINE void
+INLINE void
set_interval_plist (INTERVAL i, Lisp_Object plist)
{
i->plist = plist;