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/read.c | |
| parent | 0a193e032ba1ecf3f003e027e833dc9d274cb740 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'lisp/read.c')
| -rw-r--r-- | lisp/read.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lisp/read.c b/lisp/read.c index b8872a2..115dec4 100644 --- a/lisp/read.c +++ b/lisp/read.c @@ -27,12 +27,12 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/read.c,v 1.34 2003/01/13 03:57:58 paulo Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/read.c,v 1.37 2003/05/27 22:27:04 tsi Exp $ */ #include <errno.h> -#include "read.h" -#include "package.h" -#include "write.h" +#include "lisp/read.h" +#include "lisp/package.h" +#include "lisp/write.h" #include <fcntl.h> #include <stdarg.h> @@ -62,6 +62,10 @@ #define READ_ERROR_FIXNUM() READ_ERROR0("number is not a fixnum") #define READ_ERROR_INVARG() READ_ERROR0("invalid argument") +#ifdef __UNIXOS2__ +# define finite(x) isfinite(x) +#endif + /* * Types */ @@ -251,9 +255,8 @@ Lisp_Read(LispBuiltin *builtin) { LispObj *result; - LispObj *input_stream, *eof_error_p, *eof_value, *recursive_p; + LispObj *input_stream, *eof_error_p, *eof_value; - recursive_p = ARGUMENT(3); eof_value = ARGUMENT(2); eof_error_p = ARGUMENT(1); input_stream = ARGUMENT(0); @@ -294,11 +297,9 @@ static LispObj * LispReadChar(LispBuiltin *builtin, int nohang) { int character; - LispObj *result; - LispObj *input_stream, *eof_error_p, *eof_value, *recursive_p; + LispObj *input_stream, *eof_error_p, *eof_value; - recursive_p = ARGUMENT(3); eof_value = ARGUMENT(2); eof_error_p = ARGUMENT(1); input_stream = ARGUMENT(0); @@ -314,7 +315,6 @@ LispReadChar(LispBuiltin *builtin, int nohang) if (eof_value == UNSPEC) eof_value = NIL; - result = NIL; character = EOF; if (input_stream->data.stream.readable) { @@ -410,9 +410,8 @@ Lisp_ReadLine(LispBuiltin *builtin) int ch, length; LispObj *result, *status = NIL; - LispObj *input_stream, *eof_error_p, *eof_value, *recursive_p; + LispObj *input_stream, *eof_error_p, *eof_value; - recursive_p = ARGUMENT(3); eof_value = ARGUMENT(2); eof_error_p = ARGUMENT(1); input_stream = ARGUMENT(0); |