diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-24 10:09:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-24 10:09:07 +0000 |
| commit | b03f96dc5a6651d1dc84b81b2a15cad6908b9809 (patch) | |
| tree | 699d727fdfb007a12a07d1e1f2e172617cc159ef /src/intervals.h | |
| parent | 52bec650ae314402c242ce700bb09be42ef8ae55 (diff) | |
| parent | 20ca5ee4f7d897d79416a6fdd084db1eabb392b0 (diff) | |
| download | emacs-b03f96dc5a6651d1dc84b81b2a15cad6908b9809.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
Diffstat (limited to 'src/intervals.h')
| -rw-r--r-- | src/intervals.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/intervals.h b/src/intervals.h index c15611388f1..228c249f41b 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -75,24 +75,7 @@ struct interval /* Size of a pointer to an interval structure */ #define INTERVAL_PTR_SIZE (sizeof (struct interval *)) -/* True if an interval pointer is null, or is a Lisp_Buffer or - Lisp_String pointer (meaning it points to the owner of this - interval tree). */ -#ifdef NO_UNION_TYPE -#define INT_LISPLIKE(i) (BUFFERP ((Lisp_Object)(i)) \ - || STRINGP ((Lisp_Object)(i))) -#else -#define INT_LISPLIKE(i) (BUFFERP ((Lisp_Object){(EMACS_INT)(i)}) \ - || STRINGP ((Lisp_Object){(EMACS_INT)(i)})) -#endif - -#ifdef ENABLE_CHECKING -#define NULL_INTERVAL_P(i) \ - (CHECK (!INT_LISPLIKE (i), "non-interval"), (i) == NULL_INTERVAL) -/* old #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL || INT_LISPLIKE (i)) */ -#else #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL) -#endif /* True if this interval has no right child. */ #define NULL_RIGHT_CHILD(i) ((i)->right == NULL_INTERVAL) @@ -162,7 +145,7 @@ struct interval casts to get around this, it will break some development work in progress. */ #define SET_INTERVAL_PARENT(i,p) \ - (eassert (!INT_LISPLIKE (p)), (i)->up_obj = 0, (i)->up.interval = (p)) + ((i)->up_obj = 0, (i)->up.interval = (p)) #define SET_INTERVAL_OBJECT(i,o) \ (eassert (BUFFERP (o) || STRINGP (o)), (i)->up_obj = 1, (i)->up.obj = (o)) #define INTERVAL_PARENT(i) \ |