XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 9 insertions, 23 deletions

diff --git a/lisp/bytecode.c b/lisp/bytecode.c
index 39667b0..9ee47ba 100644
--- a/lisp/bytecode.c
+++ b/lisp/bytecode.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/bytecode.c,v 1.15 2003/01/29 03:05:53 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/bytecode.c,v 1.18 2003/05/28 14:13:11 tsi Exp $ */
 
 
 /*
@@ -93,8 +93,8 @@ somethings TODO:
  */
 
 
-#include "bytecode.h"
-#include "write.h"
+#include "lisp/bytecode.h"
+#include "lisp/write.h"
 
 #define	SYMBOL_KEYWORD	-1	/* A keyword, load as constant */
 #define	SYMBOL_CONSTANT	-2	/* Defined as constant at compile time */
@@ -337,7 +337,7 @@ static LispObj *cons, *cons1, *cons2, *cons3, *cons4, *cons5, *cons6, *cons7;
 /*
  * Implementation
  */
-#include "compile.c"
+#include "lisp/compile.c"
 
 void
 LispBytecodeInit(void)
@@ -395,11 +395,10 @@ Lisp_Compile(LispBuiltin *builtin)
 	    goto finished_compilation;
 	else if (atom->a_function) {
 	    LispCom com;
-	    int failed, *pfailed;
-	    int lex, base, *plex, *pbase;
+	    int failed;
+	    int lex = 0, base;
 	    LispArgList *alist;
-	    LispObj *lambda, *form, *arguments, **parguments;
-	    LispObj **presult, **pwarnings_p, **pfailure_p, **pform;
+	    LispObj *lambda, *form, *arguments;
 
 	    lambda = atom->property->fun.function;
 	    if (definition != UNSPEC || lambda->funtype != LispFunction)
@@ -485,14 +484,6 @@ Lisp_Compile(LispBuiltin *builtin)
 	    com.plist = CONS(NIL, NIL);
 	    GC_PROTECT(com.plist);
 
-	    pfailed = &failed;
-	    plex = &lex;
-	    pbase = &base;
-	    pform = &form;
-	    presult = &result;
-	    pwarnings_p = &warnings_p;
-	    pfailure_p = &failure_p;
-	    parguments = &arguments;
 	    failed = 1;
 	    if (setjmp(com.jmp) == 0) {
 		/* Save interpreter state */
@@ -681,7 +672,6 @@ Lisp_Disassemble(LispBuiltin *builtin)
 	LispObj **constants;
 	LispAtom **symbols;
 	LispBuiltin **builtins;
-	unsigned char **codes;
 	LispObj **names;
 	short stack, num_constants, num_symbols, num_builtins, num_bytecodes;
 	unsigned char *base, *stream = bytecode->data.bytecode.bytecode->code;
@@ -720,7 +710,6 @@ Lisp_Disassemble(LispBuiltin *builtin)
 	stream += num_symbols * sizeof(LispAtom*);
 	builtins = (LispBuiltin**)stream;
 	stream += num_builtins * sizeof(LispBuiltin*);
-	codes = (unsigned char**)stream;
 	stream += num_bytecodes * sizeof(unsigned char*);
 	names = (LispObj**)stream;
 	stream += num_bytecodes * sizeof(LispObj*);
@@ -1200,9 +1189,8 @@ LispObj *
 LispCompileForm(LispObj *form)
 {
     GC_ENTER();
-    int failed, *pfailed;
+    int failed;
     LispCom com;
-    LispObj *code, **pform;
 
     if (!CONSP(form))
 	/* Incorrect call or NIL */
@@ -1217,11 +1205,9 @@ LispCompileForm(LispObj *form)
     com.plist = CONS(NIL, NIL);
     GC_PROTECT(com.plist);
 
-    pfailed = &failed;
-    pform = &form;
     failed = 1;
     if (setjmp(com.jmp) == 0) {
-	for (code = form; CONSP(form); form = CDR(form)) {
+	for (; CONSP(form); form = CDR(form)) {
 	    com.form = form;
 	    ComEval(&com, CAR(form));
 	}