summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamm Maguire <camm@debian.org>2014-04-14 17:06:50 +0000
committerCamm Maguire <camm@debian.org>2014-04-14 17:06:50 +0000
commit69c79c7f5fdebb46d7d278a852308a4e99542b64 (patch)
tree74b7156b30b19d3ce5e7a967f8f147fe7d53ef67
parentbf6bb492a33b3576c0b34b7f17fd581d56f46dc7 (diff)
downloadgcl-69c79c7f5fdebb46d7d278a852308a4e99542b64.tar.gz
FFN boot cleanups 2
-rw-r--r--gcl/o/boot.c4
-rwxr-xr-xgcl/o/eval.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/gcl/o/boot.c b/gcl/o/boot.c
index c4ea8e0c..c8429c13 100644
--- a/gcl/o/boot.c
+++ b/gcl/o/boot.c
@@ -414,7 +414,7 @@ DEFUN("BUTLAST",object,fLbutlast,LISP,1,2,NONE,OO,OO,OO,OO,(object lis,...),"")
va_start(ap,lis);
nn=NEXT_ARG(n,ap,l,f,make_fixnum(1));
- RETURN1(fLldiff(lis,(VFUN_NARGS=2,FFN(fLlast)(lis,nn))));
+ RETURN1(FFN(fLldiff)(lis,(VFUN_NARGS=2,FFN(fLlast)(lis,nn))));
}
@@ -426,7 +426,7 @@ DEFUN("APPEND",object,fSappend,LISP,0,63,NONE,OO,OO,OO,OO,(object first,...),"")
va_start(ap,first);
for (;(z=NEXT_ARG(n,ap,l,f,OBJNULL))!=OBJNULL;) {
if (z==Cnil) continue;
- y=fLcopy_list(y);
+ y=FFN(fLcopy_list)(y);
if (r==Cnil)
r=rp=y;
else
diff --git a/gcl/o/eval.c b/gcl/o/eval.c
index 64001d26..4b66d3d6 100755
--- a/gcl/o/eval.c
+++ b/gcl/o/eval.c
@@ -1009,7 +1009,7 @@ DEFUN("FSET-IN",object,fSfset_in,SI,2,2,NONE,OO,OO,OO,OO,(object sym,object src)
object x;
- x=fSinit_function(list(6,Cnil,Cnil,src,Cnil,Cnil,sym),FFN(fSeval_src),Cnil,Cnil,-1,0,(((1<<6)-1)<<6)|(((1<<5)-1)<<12)|(1<<17));
+ x=fSinit_function(list(6,Cnil,Cnil,src,Cnil,Cnil,sym),(void *)FFN(fSeval_src),Cnil,Cnil,-1,0,(((1<<6)-1)<<6)|(((1<<5)-1)<<12)|(1<<17));
x->fun.fun_env=src_env;
if (sym!=Cnil) fSfset(sym,x);
RETURN1(x);