diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
| commit | c8a87639c7cb7aef72630978a0e5a0d92618140c (patch) | |
| tree | 862068307dff135870c4ae58be677408c4942a39 /lisp/internal.h | |
| parent | 0a193e032ba1ecf3f003e027e833dc9d274cb740 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'lisp/internal.h')
| -rw-r--r-- | lisp/internal.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/internal.h b/lisp/internal.h index 1061618..a0c6f10 100644 --- a/lisp/internal.h +++ b/lisp/internal.h @@ -27,13 +27,13 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/internal.h,v 1.49 2002/12/11 04:44:27 paulo Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/internal.h,v 1.51 2003/05/27 22:27:03 tsi Exp $ */ #ifndef Lisp_internal_h #define Lisp_internal_h #include <stdio.h> -#include "lisp.h" +#include "lisp/lisp.h" #include "mp.h" #include "re.h" @@ -144,8 +144,9 @@ typedef struct _LispMac LispMac; STRFUN(builtin), STROBJ(object)) #define XOBJECT_TYPE(object) ((object)->type) -#define OBJECT_TYPE(object) \ - (POINTERP(object) ? XOBJECT_TYPE(object) : (long)(object) & BIT_MASK) +#define OBJECT_TYPE(object) (POINTERP(object) ? \ + XOBJECT_TYPE(object) : \ + (LispType)((long)(object) & BIT_MASK)) #define NIL (LispObj*)0x00000001 @@ -558,7 +559,7 @@ struct _LispObj { struct { char *string; long length; - int writable : 1; + unsigned int writable : 1; } string; long integer; double dfloat; @@ -608,8 +609,8 @@ struct _LispObj { } source; LispObj *pathname; LispStreamType type : 6; - int readable : 1; - int writable : 1; + unsigned int readable : 1; + unsigned int writable : 1; } stream; struct { void *data; |