diff --git a/lib/clib/bessel.c b/lib/clib/bessel.c index 6b5ea7e40..9a9f29752 100644 --- a/lib/clib/bessel.c +++ b/lib/clib/bessel.c @@ -17,4 +17,4 @@ bessel(ctx,n,argv,env) context *ctx; int n; pointer argv[], *env; -{ defun(ctx, "BESSEL", argv[0], BESSEL);} +{ defun(ctx, "BESSEL", argv[0], BESSEL,NULL);} diff --git a/lib/clib/charconv.c b/lib/clib/charconv.c index e576a985d..c534f1407 100644 --- a/lib/clib/charconv.c +++ b/lib/clib/charconv.c @@ -88,10 +88,10 @@ pointer ICONV(context *ctx, int n, pointer *argv) charconv(context *ctx, int n, pointer argv[]) { pointer mod=argv[0]; - defun(ctx,"CHARCONV",mod,cconv); - defun(ctx,"ICONV-OPEN", mod, ICONVOPEN); - defun(ctx,"ICONV-CLOSE", mod, ICONVCLOSE); - defun(ctx, "ICONV", mod, ICONV); + defun(ctx,"CHARCONV",mod,cconv,NULL); + defun(ctx,"ICONV-OPEN", mod, ICONVOPEN,NULL); + defun(ctx,"ICONV-CLOSE", mod, ICONVCLOSE,NULL); + defun(ctx, "ICONV", mod, ICONV,NULL); } diff --git a/lib/clib/floatdouble.c b/lib/clib/floatdouble.c index d1bf5edd9..4b679038b 100644 --- a/lib/clib/floatdouble.c +++ b/lib/clib/floatdouble.c @@ -92,9 +92,9 @@ context *ctx; int n; pointer argv[]; { pointer mod=argv[0]; - defun(ctx,"FLOAT2DOUBLE",mod,F2D); - defun(ctx,"DOUBLE2FLOAT",mod,D2F); - defun(ctx,"SHORT2FLOAT",mod,S2F); + defun(ctx,"FLOAT2DOUBLE",mod,F2D,NULL); + defun(ctx,"DOUBLE2FLOAT",mod,D2F,NULL); + defun(ctx,"SHORT2FLOAT",mod,S2F,NULL); } diff --git a/lib/clib/linux_lowio.c b/lib/clib/linux_lowio.c index d9da3bee2..e81d42a26 100644 --- a/lib/clib/linux_lowio.c +++ b/lib/clib/linux_lowio.c @@ -42,9 +42,9 @@ pointer linux_lowio(context *ctx, int n, pointer argv[], pointer env) printf("ioperm, outb, inb\n"); - defun(ctx,"IOPERM", mod, IOPERM); - defun(ctx,"OUTB", mod, OUTB); - defun(ctx,"INB", mod, INB); + defun(ctx,"IOPERM", mod, IOPERM,NULL); + defun(ctx,"OUTB", mod, OUTB,NULL); + defun(ctx,"INB", mod, INB,NULL); printf("linux low level IO functions defined.\n"); diff --git a/lib/clib/ndbm.c b/lib/clib/ndbm.c index 9e90e939e..535e5a24d 100644 --- a/lib/clib/ndbm.c +++ b/lib/clib/ndbm.c @@ -108,14 +108,14 @@ register pointer argv[]; ndbm(context *ctx, int n, pointer argv[]) { pointer mod=argv[0]; - defun(ctx,"DBM-OPEN",mod,DBM_OPEN); - defun(ctx,"DBM-CLOSE",mod,DBM_CLOSE); - defun(ctx,"DBM-FETCH",mod,DBM_FETCH); - defun(ctx,"DBM-STORE",mod,DBM_STORE); - defun(ctx,"DBM-DELETE",mod,DBM_DELETE); - defun(ctx,"DBM-FIRSTKEY",mod,DBM_FIRSTKEY); - defun(ctx,"DBM-NEXTKEY",mod,DBM_NEXTKEY); - defun(ctx,"DBM-ERROR",mod,DBM_ERROR); - defun(ctx,"DBM-CLEARERR",mod,DBM_CLEARERR); + defun(ctx,"DBM-OPEN",mod,DBM_OPEN,NULL); + defun(ctx,"DBM-CLOSE",mod,DBM_CLOSE,NULL); + defun(ctx,"DBM-FETCH",mod,DBM_FETCH,NULL); + defun(ctx,"DBM-STORE",mod,DBM_STORE,NULL); + defun(ctx,"DBM-DELETE",mod,DBM_DELETE,NULL); + defun(ctx,"DBM-FIRSTKEY",mod,DBM_FIRSTKEY,NULL); + defun(ctx,"DBM-NEXTKEY",mod,DBM_NEXTKEY,NULL); + defun(ctx,"DBM-ERROR",mod,DBM_ERROR,NULL); + defun(ctx,"DBM-CLEARERR",mod,DBM_CLEARERR,NULL); } diff --git a/lib/clib/posix.c b/lib/clib/posix.c index e8c963f81..b6dc56257 100644 --- a/lib/clib/posix.c +++ b/lib/clib/posix.c @@ -35,7 +35,7 @@ posix(context *ctx, int n, pointer argv[]) spevalof(PACKAGE)=unixpkg; #if Solaris2 - defun(ctx,"NANOSLEEP",mod,NANOSLEEP); + defun(ctx,"NANOSLEEP",mod,NANOSLEEP,NULL); #endif /* restore package*/ spevalof(PACKAGE)=p; diff --git a/lib/clib/rfft.c b/lib/clib/rfft.c index 1df079b0d..6b38b13a7 100644 --- a/lib/clib/rfft.c +++ b/lib/clib/rfft.c @@ -37,6 +37,6 @@ pointer argv[]; eusmain(mod) pointer mod; { - defun("FFT",mod,FFT); - defun("INVERSE-FFT",mod,INVFFT); + defun("FFT",mod,FFT,NULL); + defun("INVERSE-FFT",mod,INVFFT,NULL); } diff --git a/lib/clib/sigmoid.c b/lib/clib/sigmoid.c index 87e48cda8..380d3ab02 100644 --- a/lib/clib/sigmoid.c +++ b/lib/clib/sigmoid.c @@ -47,7 +47,7 @@ context *ctx; int n; pointer argv[]; { pointer mod=argv[0]; - defun(ctx,"SIGMOID",mod,SIGMOID); - defun(ctx,"SIGMOIDX",mod,SIGMOIDX); - defun(ctx,"OFFSET-VECTOR",mod,OFFSET_VECTOR);} + defun(ctx,"SIGMOID",mod,SIGMOID,NULL); + defun(ctx,"SIGMOIDX",mod,SIGMOIDX,NULL); + defun(ctx,"OFFSET-VECTOR",mod,OFFSET_VECTOR,NULL);} diff --git a/lib/clib/ssvdc.c b/lib/clib/ssvdc.c index 9fe6e2cd8..a87fedbe1 100644 --- a/lib/clib/ssvdc.c +++ b/lib/clib/ssvdc.c @@ -61,5 +61,5 @@ context *ctx; int n; pointer argv[]; { - defun(ctx,"SSVDC",argv[0],SSVDC);} + defun(ctx,"SSVDC",argv[0],SSVDC,NULL);} diff --git a/lib/clib/vxwcom.c b/lib/clib/vxwcom.c index e130043e0..f6e42d89f 100644 --- a/lib/clib/vxwcom.c +++ b/lib/clib/vxwcom.c @@ -117,7 +117,7 @@ pointer CALL_VXW(context *ctx, int n, pointer argv[]) pointer vxwcom(context *ctx, int n, pointer argv[], pointer env) { pointer mod = argv[0]; - defun(ctx, "VXW",mod,CALL_VXW); + defun(ctx, "VXW",mod,CALL_VXW,NULL); return(T); } diff --git a/lisp/c/arith.c b/lisp/c/arith.c index b963c73bb..75f88ce57 100644 --- a/lisp/c/arith.c +++ b/lisp/c/arith.c @@ -1417,52 +1417,52 @@ void arith(ctx,mod) register context *ctx; pointer mod; { - defun(ctx,"=",mod,NUMEQUAL); - defun(ctx,">",mod,GREATERP); - defun(ctx,"<",mod,LESSP); - defun(ctx,">=",mod,GREQP); - defun(ctx,"<=",mod,LSEQP); - defun(ctx,"MOD",mod,MOD); - defun(ctx,"1-",mod,SUB1); - defun(ctx,"1+",mod,ADD1); - defun(ctx,"+",mod,PLUS); - defun(ctx,"-",mod,MINUS); - defun(ctx,"*",mod,TIMES); - defun(ctx,"/",mod,QUOTIENT); - defun(ctx,"SIN",mod,SIN); - defun(ctx,"COS",mod,COS); - defun(ctx,"TAN",mod,TAN); - defun(ctx,"ATAN",mod,ATAN); - defun(ctx,"TANH",mod,TANH); - defun(ctx,"ATANH",mod,ATANH); - defun(ctx,"SINH",mod,SINH); - defun(ctx,"ASINH",mod,ASINH); - defun(ctx,"COSH",mod,COSH); - defun(ctx,"ACOSH",mod,ACOSH); - defun(ctx,"SQRT",mod,SQRT); - defun(ctx,"LOG",mod,LOG); - defun(ctx,"EXP",mod,EXP); - defun(ctx,"ABS",mod,ABS); - defun(ctx,"ROUND",mod,ROUND); - defun(ctx,"FLOOR",mod,FLOOR); - defun(ctx,"CEILING",mod,CEILING); - defun(ctx,"TRUNCATE",mod,TRUNCATE); - defun(ctx,"FLOAT",mod,EUSFLOAT); - defun(ctx,"DECODE-FLOAT",mod,DECFLOAT); - defun(ctx,"MAX",mod,MAX); - defun(ctx,"MIN",mod,MIN); - defun(ctx,"LOGAND",mod,LOGAND); - defun(ctx,"LOGIOR",mod,LOGIOR); - defun(ctx,"LOGXOR",mod,LOGXOR); - defun(ctx,"LOGEQV",mod,LOGEQV); - defun(ctx,"LOGNAND",mod,LOGNAND); - defun(ctx,"LOGNOR",mod,LOGNOR); - defun(ctx,"LOGNOT",mod,LOGNOT); - defun(ctx,"LOGTEST",mod,LOGTEST); - defun(ctx,"LOGBITP",mod,LOGBITP); - defun(ctx,"ASH",mod,ASH); - defun(ctx,"LDB",mod,LDB); - defun(ctx,"DPB",mod,DPB); - defun(ctx,"RANDOM",mod,RANDOM); - defun(ctx,"FREXP",mod,FREXP); + defun(ctx,"=",mod,NUMEQUAL,NULL); + defun(ctx,">",mod,GREATERP,NULL); + defun(ctx,"<",mod,LESSP,NULL); + defun(ctx,">=",mod,GREQP,NULL); + defun(ctx,"<=",mod,LSEQP,NULL); + defun(ctx,"MOD",mod,MOD,NULL); + defun(ctx,"1-",mod,SUB1,NULL); + defun(ctx,"1+",mod,ADD1,NULL); + defun(ctx,"+",mod,PLUS,NULL); + defun(ctx,"-",mod,MINUS,NULL); + defun(ctx,"*",mod,TIMES,NULL); + defun(ctx,"/",mod,QUOTIENT,NULL); + defun(ctx,"SIN",mod,SIN,NULL); + defun(ctx,"COS",mod,COS,NULL); + defun(ctx,"TAN",mod,TAN,NULL); + defun(ctx,"ATAN",mod,ATAN,NULL); + defun(ctx,"TANH",mod,TANH,NULL); + defun(ctx,"ATANH",mod,ATANH,NULL); + defun(ctx,"SINH",mod,SINH,NULL); + defun(ctx,"ASINH",mod,ASINH,NULL); + defun(ctx,"COSH",mod,COSH,NULL); + defun(ctx,"ACOSH",mod,ACOSH,NULL); + defun(ctx,"SQRT",mod,SQRT,NULL); + defun(ctx,"LOG",mod,LOG,NULL); + defun(ctx,"EXP",mod,EXP,NULL); + defun(ctx,"ABS",mod,ABS,NULL); + defun(ctx,"ROUND",mod,ROUND,NULL); + defun(ctx,"FLOOR",mod,FLOOR,NULL); + defun(ctx,"CEILING",mod,CEILING,NULL); + defun(ctx,"TRUNCATE",mod,TRUNCATE,NULL); + defun(ctx,"FLOAT",mod,EUSFLOAT,NULL); + defun(ctx,"DECODE-FLOAT",mod,DECFLOAT,NULL); + defun(ctx,"MAX",mod,MAX,NULL); + defun(ctx,"MIN",mod,MIN,NULL); + defun(ctx,"LOGAND",mod,LOGAND,NULL); + defun(ctx,"LOGIOR",mod,LOGIOR,NULL); + defun(ctx,"LOGXOR",mod,LOGXOR,NULL); + defun(ctx,"LOGEQV",mod,LOGEQV,NULL); + defun(ctx,"LOGNAND",mod,LOGNAND,NULL); + defun(ctx,"LOGNOR",mod,LOGNOR,NULL); + defun(ctx,"LOGNOT",mod,LOGNOT,NULL); + defun(ctx,"LOGTEST",mod,LOGTEST,NULL); + defun(ctx,"LOGBITP",mod,LOGBITP,NULL); + defun(ctx,"ASH",mod,ASH,NULL); + defun(ctx,"LDB",mod,LDB,NULL); + defun(ctx,"DPB",mod,DPB,NULL); + defun(ctx,"RANDOM",mod,RANDOM,NULL); + defun(ctx,"FREXP",mod,FREXP,NULL); } diff --git a/lisp/c/arith.old.c b/lisp/c/arith.old.c index 28d388b46..e331043e5 100644 --- a/lisp/c/arith.old.c +++ b/lisp/c/arith.old.c @@ -1395,52 +1395,52 @@ arith(ctx,mod) register context *ctx; pointer mod; { - defun(ctx,"=",mod,NUMEQUAL); - defun(ctx,">",mod,GREATERP); - defun(ctx,"<",mod,LESSP); - defun(ctx,">=",mod,GREQP); - defun(ctx,"<=",mod,LSEQP); - defun(ctx,"MOD",mod,MOD); - defun(ctx,"1-",mod,SUB1); - defun(ctx,"1+",mod,ADD1); - defun(ctx,"+",mod,PLUS); - defun(ctx,"-",mod,MINUS); - defun(ctx,"*",mod,TIMES); - defun(ctx,"/",mod,QUOTIENT); - defun(ctx,"SIN",mod,SIN); - defun(ctx,"COS",mod,COS); - defun(ctx,"TAN",mod,TAN); - defun(ctx,"ATAN",mod,ATAN); - defun(ctx,"TANH",mod,TANH); - defun(ctx,"ATANH",mod,ATANH); - defun(ctx,"SINH",mod,SINH); - defun(ctx,"ASINH",mod,ASINH); - defun(ctx,"COSH",mod,COSH); - defun(ctx,"ACOSH",mod,ACOSH); - defun(ctx,"SQRT",mod,SQRT); - defun(ctx,"LOG",mod,LOG); - defun(ctx,"EXP",mod,EXP); - defun(ctx,"ABS",mod,ABS); - defun(ctx,"ROUND",mod,ROUND); - defun(ctx,"FLOOR",mod,FLOOR); - defun(ctx,"CEILING",mod,CEILING); - defun(ctx,"TRUNCATE",mod,TRUNCATE); - defun(ctx,"FLOAT",mod,FLOAT); - defun(ctx,"DECODE-FLOAT",mod,DECFLOAT); - defun(ctx,"MAX",mod,MAX); - defun(ctx,"MIN",mod,MIN); - defun(ctx,"LOGAND",mod,LOGAND); - defun(ctx,"LOGIOR",mod,LOGIOR); - defun(ctx,"LOGXOR",mod,LOGXOR); - defun(ctx,"LOGEQV",mod,LOGEQV); - defun(ctx,"LOGNAND",mod,LOGNAND); - defun(ctx,"LOGNOR",mod,LOGNOR); - defun(ctx,"LOGNOT",mod,LOGNOT); - defun(ctx,"LOGTEST",mod,LOGTEST); - defun(ctx,"LOGBITP",mod,LOGBITP); - defun(ctx,"ASH",mod,ASH); - defun(ctx,"LDB",mod,LDB); - defun(ctx,"DPB",mod,DPB); - defun(ctx,"RANDOM",mod,RANDOM); - defun(ctx,"FREXP",mod,FREXP); + defun(ctx,"=",mod,NUMEQUAL,NULL); + defun(ctx,">",mod,GREATERP,NULL); + defun(ctx,"<",mod,LESSP,NULL); + defun(ctx,">=",mod,GREQP,NULL); + defun(ctx,"<=",mod,LSEQP,NULL); + defun(ctx,"MOD",mod,MOD,NULL); + defun(ctx,"1-",mod,SUB1,NULL); + defun(ctx,"1+",mod,ADD1,NULL); + defun(ctx,"+",mod,PLUS,NULL); + defun(ctx,"-",mod,MINUS,NULL); + defun(ctx,"*",mod,TIMES,NULL); + defun(ctx,"/",mod,QUOTIENT,NULL); + defun(ctx,"SIN",mod,SIN,NULL); + defun(ctx,"COS",mod,COS,NULL); + defun(ctx,"TAN",mod,TAN,NULL); + defun(ctx,"ATAN",mod,ATAN,NULL); + defun(ctx,"TANH",mod,TANH,NULL); + defun(ctx,"ATANH",mod,ATANH,NULL); + defun(ctx,"SINH",mod,SINH,NULL); + defun(ctx,"ASINH",mod,ASINH,NULL); + defun(ctx,"COSH",mod,COSH,NULL); + defun(ctx,"ACOSH",mod,ACOSH,NULL); + defun(ctx,"SQRT",mod,SQRT,NULL); + defun(ctx,"LOG",mod,LOG,NULL); + defun(ctx,"EXP",mod,EXP,NULL); + defun(ctx,"ABS",mod,ABS,NULL); + defun(ctx,"ROUND",mod,ROUND,NULL); + defun(ctx,"FLOOR",mod,FLOOR,NULL); + defun(ctx,"CEILING",mod,CEILING,NULL); + defun(ctx,"TRUNCATE",mod,TRUNCATE,NULL); + defun(ctx,"FLOAT",mod,FLOAT,NULL); + defun(ctx,"DECODE-FLOAT",mod,DECFLOAT,NULL); + defun(ctx,"MAX",mod,MAX,NULL); + defun(ctx,"MIN",mod,MIN,NULL); + defun(ctx,"LOGAND",mod,LOGAND,NULL); + defun(ctx,"LOGIOR",mod,LOGIOR,NULL); + defun(ctx,"LOGXOR",mod,LOGXOR,NULL); + defun(ctx,"LOGEQV",mod,LOGEQV,NULL); + defun(ctx,"LOGNAND",mod,LOGNAND,NULL); + defun(ctx,"LOGNOR",mod,LOGNOR,NULL); + defun(ctx,"LOGNOT",mod,LOGNOT,NULL); + defun(ctx,"LOGTEST",mod,LOGTEST,NULL); + defun(ctx,"LOGBITP",mod,LOGBITP,NULL); + defun(ctx,"ASH",mod,ASH,NULL); + defun(ctx,"LDB",mod,LDB,NULL); + defun(ctx,"DPB",mod,DPB,NULL); + defun(ctx,"RANDOM",mod,RANDOM,NULL); + defun(ctx,"FREXP",mod,FREXP,NULL); } diff --git a/lisp/c/charstring.c b/lisp/c/charstring.c index ecdff8c00..c200c024c 100644 --- a/lisp/c/charstring.c +++ b/lisp/c/charstring.c @@ -181,23 +181,23 @@ void charstring(ctx,mod) register context *ctx; register pointer mod; { - defun(ctx,"CHAR",mod,EUSCHAR); - defun(ctx,"SCHAR",mod,EUSCHAR); - defun(ctx,"SETCHAR",mod,SETCHAR); - defun(ctx,"ALPHA-CHAR-P",mod,ALPHAP); - defun(ctx,"UPPER-CASE-P",mod,UPCASEP); - defun(ctx,"LOWER-CASE-P",mod,LOWCASEP); - defun(ctx,"DIGIT-CHAR-P",mod,DIGITP); - defun(ctx,"ALPHANUMERICP",mod,ALNUMP); - defun(ctx,"CHAR-UPCASE",mod,CHUPCASE); - defun(ctx,"CHAR-DOWNCASE",mod,CHDOWNCASE); - defun(ctx,"STRINGEQ",mod,STRINGEQ); - defun(ctx,"STRINGEQUAL",mod,STRINGEQUAL); - defun(ctx,"STRING<",mod,STR_LT); - defun(ctx,"STRING<=",mod,STR_LE); - defun(ctx,"STRING=",mod,STR_EQ); - defun(ctx,"STRING>",mod,STR_GT); - defun(ctx,"STRING>=",mod,STR_GE); + defun(ctx,"CHAR",mod,EUSCHAR,NULL); + defun(ctx,"SCHAR",mod,EUSCHAR,NULL); + defun(ctx,"SETCHAR",mod,SETCHAR,NULL); + defun(ctx,"ALPHA-CHAR-P",mod,ALPHAP,NULL); + defun(ctx,"UPPER-CASE-P",mod,UPCASEP,NULL); + defun(ctx,"LOWER-CASE-P",mod,LOWCASEP,NULL); + defun(ctx,"DIGIT-CHAR-P",mod,DIGITP,NULL); + defun(ctx,"ALPHANUMERICP",mod,ALNUMP,NULL); + defun(ctx,"CHAR-UPCASE",mod,CHUPCASE,NULL); + defun(ctx,"CHAR-DOWNCASE",mod,CHDOWNCASE,NULL); + defun(ctx,"STRINGEQ",mod,STRINGEQ,NULL); + defun(ctx,"STRINGEQUAL",mod,STRINGEQUAL,NULL); + defun(ctx,"STRING<",mod,STR_LT,NULL); + defun(ctx,"STRING<=",mod,STR_LE,NULL); + defun(ctx,"STRING=",mod,STR_EQ,NULL); + defun(ctx,"STRING>",mod,STR_GT,NULL); + defun(ctx,"STRING>=",mod,STR_GE,NULL); } diff --git a/lisp/c/charstring.old.c b/lisp/c/charstring.old.c index 1238b5e29..56e869990 100644 --- a/lisp/c/charstring.old.c +++ b/lisp/c/charstring.old.c @@ -180,23 +180,23 @@ charstring(ctx,mod) register context *ctx; register pointer mod; { - defun(ctx,"CHAR",mod,CHAR); - defun(ctx,"SCHAR",mod,CHAR); - defun(ctx,"SETCHAR",mod,SETCHAR); - defun(ctx,"ALPHA-CHAR-P",mod,ALPHAP); - defun(ctx,"UPPER-CASE-P",mod,UPCASEP); - defun(ctx,"LOWER-CASE-P",mod,LOWCASEP); - defun(ctx,"DIGIT-CHAR-P",mod,DIGITP); - defun(ctx,"ALPHANUMERICP",mod,ALNUMP); - defun(ctx,"CHAR-UPCASE",mod,CHUPCASE); - defun(ctx,"CHAR-DOWNCASE",mod,CHDOWNCASE); - defun(ctx,"STRINGEQ",mod,STRINGEQ); - defun(ctx,"STRINGEQUAL",mod,STRINGEQUAL); - defun(ctx,"STRING<",mod,STR_LT); - defun(ctx,"STRING<=",mod,STR_LE); - defun(ctx,"STRING=",mod,STR_EQ); - defun(ctx,"STRING>",mod,STR_GT); - defun(ctx,"STRING>=",mod,STR_GE); + defun(ctx,"CHAR",mod,CHAR,NULL); + defun(ctx,"SCHAR",mod,CHAR,NULL); + defun(ctx,"SETCHAR",mod,SETCHAR,NULL); + defun(ctx,"ALPHA-CHAR-P",mod,ALPHAP,NULL); + defun(ctx,"UPPER-CASE-P",mod,UPCASEP,NULL); + defun(ctx,"LOWER-CASE-P",mod,LOWCASEP,NULL); + defun(ctx,"DIGIT-CHAR-P",mod,DIGITP,NULL); + defun(ctx,"ALPHANUMERICP",mod,ALNUMP,NULL); + defun(ctx,"CHAR-UPCASE",mod,CHUPCASE,NULL); + defun(ctx,"CHAR-DOWNCASE",mod,CHDOWNCASE,NULL); + defun(ctx,"STRINGEQ",mod,STRINGEQ,NULL); + defun(ctx,"STRINGEQUAL",mod,STRINGEQUAL,NULL); + defun(ctx,"STRING<",mod,STR_LT,NULL); + defun(ctx,"STRING<=",mod,STR_LE,NULL); + defun(ctx,"STRING=",mod,STR_EQ,NULL); + defun(ctx,"STRING>",mod,STR_GT,NULL); + defun(ctx,"STRING>=",mod,STR_GE,NULL); } diff --git a/lisp/c/collector.c b/lisp/c/collector.c index e0d01c530..91c8f36fa 100644 --- a/lisp/c/collector.c +++ b/lisp/c/collector.c @@ -1236,10 +1236,10 @@ void rgcfunc(register context *ctx, pointer mod) { pointer p = Spevalof(PACKAGE); pointer_update(Spevalof(PACKAGE), syspkg); - defun(ctx, "RGCCOUNT", mod, RGCCOUNT); - defun(ctx, "RGCTIME", mod, RGC_GCTIME); + defun(ctx, "RGCCOUNT", mod, RGCCOUNT,NULL); + defun(ctx, "RGCTIME", mod, RGC_GCTIME,NULL); #ifdef __PROFILE_GC - defun(ctx, "RGCALLOCATED", mod, RGCALLOCATED); + defun(ctx, "RGCALLOCATED", mod, RGCALLOCATED,NULL); #endif pointer_update(Spevalof(PACKAGE), p); } diff --git a/lisp/c/eus.h b/lisp/c/eus.h index 05962f001..888b1c7f5 100644 --- a/lisp/c/eus.h +++ b/lisp/c/eus.h @@ -1063,7 +1063,7 @@ extern pointer makemodule(context *, int); extern pointer makebig1(long); extern pointer eusfloat_to_big(float); extern eusfloat_t big_to_float(pointer); -extern pointer defun(context *, char *, pointer, pointer(*)()); +extern pointer defun(context *, char *, pointer, pointer(*)(), char *); extern pointer defmacro(context *, char *, pointer, pointer(*)()); extern pointer defspecial(context *, char *, pointer, pointer(*)()); extern pointer defunpkg(context *, char *, pointer, pointer(*)(),pointer); diff --git a/lisp/c/eus_proto.h b/lisp/c/eus_proto.h index a03a9ee36..f3ae59181 100644 --- a/lisp/c/eus_proto.h +++ b/lisp/c/eus_proto.h @@ -344,7 +344,7 @@ extern pointer makeratio(int /*num*/, int /*denom*/); extern pointer makebig(int /*n*/); extern pointer makebig1(long /*x*/); extern pointer makebig2(long /*hi*/, long /*lo*/); -extern pointer defun(context */*ctx*/, char */*name*/, pointer /*mod*/, pointer (*/*f*/)()); +extern pointer defun(context */*ctx*/, char */*name*/, pointer /*mod*/, pointer (*/*f*/)(), char */*document*/); extern pointer defunpkg(context */*ctx*/, char */*name*/, pointer /*mod*/, pointer (*/*f*/)(), pointer /*pkg*/); extern pointer defmacro(context */*ctx*/, char */*name*/, pointer /*mod*/, pointer (*/*f*/)()); extern int special_index(void); diff --git a/lisp/c/fstringdouble.c b/lisp/c/fstringdouble.c index 8e4d54c02..9e64aee37 100644 --- a/lisp/c/fstringdouble.c +++ b/lisp/c/fstringdouble.c @@ -399,15 +399,15 @@ int n; pointer argv[]; { pointer mod=argv[0]; #ifdef x86_64 - defun(ctx,"FLOAT-BYTESTRING2DVECTOR",mod,FSTRING2DV); - defun(ctx,"DVECTOR2FLOAT-BYTESTRING",mod,DV2FSTRING); - defun(ctx,"INTEGER-BYTESTRING2LVECTOR",mod,ISTRING2LV); - defun(ctx,"LVECTOR2INTEGER-BYTESTRING",mod,LV2ISTRING); + defun(ctx,"FLOAT-BYTESTRING2DVECTOR",mod,FSTRING2DV,NULL); + defun(ctx,"DVECTOR2FLOAT-BYTESTRING",mod,DV2FSTRING,NULL); + defun(ctx,"INTEGER-BYTESTRING2LVECTOR",mod,ISTRING2LV,NULL); + defun(ctx,"LVECTOR2INTEGER-BYTESTRING",mod,LV2ISTRING,NULL); #endif #ifdef i386 - defun(ctx,"DOUBLE-BYTESTRING2FVECTOR",mod,DSTRING2FV); - defun(ctx,"FVECTOR2DOUBLE-BYTESTRING",mod,FV2DSTRING); - defun(ctx,"LONG-LONG-BYTESTRING2IVECTOR",mod,LSTRING2IV); - defun(ctx,"IVECTOR2LONG-LONG-BYTESTRING",mod,IV2LSTRING); + defun(ctx,"DOUBLE-BYTESTRING2FVECTOR",mod,DSTRING2FV,NULL); + defun(ctx,"FVECTOR2DOUBLE-BYTESTRING",mod,FV2DSTRING,NULL); + defun(ctx,"LONG-LONG-BYTESTRING2IVECTOR",mod,LSTRING2IV,NULL); + defun(ctx,"IVECTOR2LONG-LONG-BYTESTRING",mod,IV2LSTRING,NULL); #endif } diff --git a/lisp/c/helpsub.c b/lisp/c/helpsub.c index 672509b37..d047cb3bd 100644 --- a/lisp/c/helpsub.c +++ b/lisp/c/helpsub.c @@ -162,5 +162,5 @@ context *ctx; int n; pointer argv[]; { pointer mod=argv[0]; - defun(ctx, "READ-TEX", mod, READ_TEX); + defun(ctx, "READ-TEX", mod, READ_TEX,NULL); } diff --git a/lisp/c/leo.c b/lisp/c/leo.c index d53a83acd..add1c4ad0 100644 --- a/lisp/c/leo.c +++ b/lisp/c/leo.c @@ -715,27 +715,27 @@ void leo(ctx,mod) register context *ctx; pointer mod; { - defun(ctx,"CLASS",mod,GETCLASS); - defun(ctx,"ENTER-CLASS",mod,ENTERCLASS); + defun(ctx,"CLASS",mod,GETCLASS,NULL); + defun(ctx,"ENTER-CLASS",mod,ENTERCLASS,NULL); /* defspecial("DEFCLASS",mod,DEFCLASS); */ defspecial(ctx,"DEFMETHOD",mod,DEFMETHOD); - defun(ctx,"SEND",mod,SEND); - defun(ctx,"SEND-MSG",mod,SEND); - defun(ctx,"SEND-IF-FOUND",mod,SEND_IF_FOUND); - defun(ctx,"SEND-MESSAGE",mod,SENDMESSAGE); - defun(ctx,"INSTANTIATE",mod,INSTANTIATE); - defun(ctx,"CLASSP",mod,CLASSP); - defun(ctx,"SUBCLASSP",mod,SUBCLASSP); - defun(ctx,"DERIVEDP",mod,DERIVEDP); - defun(ctx,"CLONE",mod,CLONE); - defun(ctx,"SLOT",mod,SLOT); - defun(ctx,"SETSLOT",mod,SETSLOT); - defun(ctx,"FIND-METHOD",mod,FINDMETHOD); + defun(ctx,"SEND",mod,SEND,NULL); + defun(ctx,"SEND-MSG",mod,SEND,NULL); + defun(ctx,"SEND-IF-FOUND",mod,SEND_IF_FOUND,NULL); + defun(ctx,"SEND-MESSAGE",mod,SENDMESSAGE,NULL); + defun(ctx,"INSTANTIATE",mod,INSTANTIATE,NULL); + defun(ctx,"CLASSP",mod,CLASSP,NULL); + defun(ctx,"SUBCLASSP",mod,SUBCLASSP,NULL); + defun(ctx,"DERIVEDP",mod,DERIVEDP,NULL); + defun(ctx,"CLONE",mod,CLONE,NULL); + defun(ctx,"SLOT",mod,SLOT,NULL); + defun(ctx,"SETSLOT",mod,SETSLOT,NULL); + defun(ctx,"FIND-METHOD",mod,FINDMETHOD,NULL); defunpkg(ctx,"METHOD-CACHE",mod,METHCACHE,syspkg); addcmethod(ctx,mod,CONSCAR,defkeyword(ctx,"CAR"),QCONS,NIL); addcmethod(ctx,mod,CONSCDR,defkeyword(ctx,"CDR"),QCONS,NIL); - defun(ctx,"COPY-OBJECT",mod,COPYOBJ); - defun(ctx,"BECOME",mod,BECOME); - defun(ctx,"REPLACE-OBJECT",mod,REPLACEOBJECT); + defun(ctx,"COPY-OBJECT",mod,COPYOBJ,NULL); + defun(ctx,"BECOME",mod,BECOME,NULL); + defun(ctx,"REPLACE-OBJECT",mod,REPLACEOBJECT,NULL); } diff --git a/lisp/c/lispio.c b/lisp/c/lispio.c index a4715b450..07e3d7ce4 100644 --- a/lisp/c/lispio.c +++ b/lisp/c/lispio.c @@ -572,32 +572,32 @@ register context *ctx; pointer mod; { pointer_update(Spevalof(PACKAGE),syspkg); - defun(ctx,"OPENFILE",mod,OPENFILE); + defun(ctx,"OPENFILE",mod,OPENFILE,NULL); pointer_update(Spevalof(PACKAGE),lisppkg); -/* defun(ctx,"OPEN",mod,OPEN); */ - defun(ctx,"CLOSE",mod,CLOSE); - defun(ctx,"READ",mod,READ); - defun(ctx,"READ-DELIMITED-LIST",mod,READ_DELIMITED_LIST); - defun(ctx,"READ-LINE",mod,READLINE); - defun(ctx,"READ-CHAR",mod,READCH); - defun(ctx,"UNREAD-CHAR",mod,UNREADCH); - defun(ctx,"PEEK-CHAR",mod,PEEKCH); - defun(ctx,"PRINT",mod,PRINT); - defun(ctx,"PRIN1",mod,PRIN1); - defun(ctx,"PRINC",mod,PRINC); - defun(ctx,"TERPRI",mod,TERPRI); - defun(ctx,"PRINT-SIZE",mod,PRNTSIZE); - defun(ctx,"FINISH-OUTPUT",mod,FINOUT); - defun(ctx,"WRITE-BYTE",mod,WRTBYTE); - defun(ctx,"WRITE-WORD",mod,WRTWORD); - defun(ctx,"WRITE-LONG",mod,WRTLONG); - defun(ctx,"SET-MACRO-CHARACTER",mod,SETMACROCH); - defun(ctx,"GET-MACRO-CHARACTER",mod,GETMACROCH); - defun(ctx,"SET-DISPATCH-MACRO-CHARACTER",mod,SETDISPMACRO); - defun(ctx,"GET-DISPATCH-MACRO-CHARACTER",mod,GETDISPMACRO); +/* defun(ctx,"OPEN",mod,OPEN,NULL); */ + defun(ctx,"CLOSE",mod,CLOSE,NULL); + defun(ctx,"READ",mod,READ,NULL); + defun(ctx,"READ-DELIMITED-LIST",mod,READ_DELIMITED_LIST,NULL); + defun(ctx,"READ-LINE",mod,READLINE,NULL); + defun(ctx,"READ-CHAR",mod,READCH,NULL); + defun(ctx,"UNREAD-CHAR",mod,UNREADCH,NULL); + defun(ctx,"PEEK-CHAR",mod,PEEKCH,NULL); + defun(ctx,"PRINT",mod,PRINT,NULL); + defun(ctx,"PRIN1",mod,PRIN1,NULL); + defun(ctx,"PRINC",mod,PRINC,NULL); + defun(ctx,"TERPRI",mod,TERPRI,NULL); + defun(ctx,"PRINT-SIZE",mod,PRNTSIZE,NULL); + defun(ctx,"FINISH-OUTPUT",mod,FINOUT,NULL); + defun(ctx,"WRITE-BYTE",mod,WRTBYTE,NULL); + defun(ctx,"WRITE-WORD",mod,WRTWORD,NULL); + defun(ctx,"WRITE-LONG",mod,WRTLONG,NULL); + defun(ctx,"SET-MACRO-CHARACTER",mod,SETMACROCH,NULL); + defun(ctx,"GET-MACRO-CHARACTER",mod,GETMACROCH,NULL); + defun(ctx,"SET-DISPATCH-MACRO-CHARACTER",mod,SETDISPMACRO,NULL); + defun(ctx,"GET-DISPATCH-MACRO-CHARACTER",mod,GETDISPMACRO,NULL); defunpkg(ctx,"RESET-READTABLE",mod,RESETREADTABLE,syspkg); - defun(ctx,"FORMAT",mod,XFORMAT); - defun(ctx,"ERROR",mod,SIGERROR); - defun(ctx,"INSTALL-ERROR-HANDLER",mod,INSTALL_ERRHANDLER); + defun(ctx,"FORMAT",mod,XFORMAT,NULL); + defun(ctx,"ERROR",mod,SIGERROR,NULL); + defun(ctx,"INSTALL-ERROR-HANDLER",mod,INSTALL_ERRHANDLER,NULL); } diff --git a/lisp/c/lists.c b/lisp/c/lists.c index 39e3bb2a5..412aa19de 100644 --- a/lisp/c/lists.c +++ b/lisp/c/lists.c @@ -409,35 +409,35 @@ pointer argv[]; void lists(ctx,mod) register context *ctx; register pointer mod; -{ defun(ctx,"CAR",mod,CAR); - defun(ctx,"CDR",mod,CDR); - defun(ctx,"REST",mod,CDR); - defun(ctx,"CADR",mod,CADR); - defun(ctx,"CDDR",mod,CDDR); - defun(ctx,"CDAR",mod,CDAR); - defun(ctx,"CAAR",mod,CAAR); - defun(ctx,"CADDR",mod,CADDR); - defun(ctx,"NTH",mod,NTH); - defun(ctx,"NTHCDR",mod,NTHCDR); - defun(ctx,"CONS",mod,CONS); - defun(ctx,"RPLACA",mod,RPLACA); - defun(ctx,"RPLACA2",mod,RPLACA2); - defun(ctx,"RPLACD",mod,RPLACD); - defun(ctx,"RPLACD2",mod,RPLACD2); - defun(ctx,"APPEND",mod,APPEND); - defun(ctx,"NCONC",mod,NCONC); - defun(ctx,"SUBST",mod,SUBST); - defun(ctx,"NSUBST",mod,NSUBST); +{ defun(ctx,"CAR",mod,CAR,NULL); + defun(ctx,"CDR",mod,CDR,NULL); + defun(ctx,"REST",mod,CDR,NULL); + defun(ctx,"CADR",mod,CADR,NULL); + defun(ctx,"CDDR",mod,CDDR,NULL); + defun(ctx,"CDAR",mod,CDAR,NULL); + defun(ctx,"CAAR",mod,CAAR,NULL); + defun(ctx,"CADDR",mod,CADDR,NULL); + defun(ctx,"NTH",mod,NTH,NULL); + defun(ctx,"NTHCDR",mod,NTHCDR,NULL); + defun(ctx,"CONS",mod,CONS,NULL); + defun(ctx,"RPLACA",mod,RPLACA,NULL); + defun(ctx,"RPLACA2",mod,RPLACA2,NULL); + defun(ctx,"RPLACD",mod,RPLACD,NULL); + defun(ctx,"RPLACD2",mod,RPLACD2,NULL); + defun(ctx,"APPEND",mod,APPEND,NULL); + defun(ctx,"NCONC",mod,NCONC,NULL); + defun(ctx,"SUBST",mod,SUBST,NULL); + defun(ctx,"NSUBST",mod,NSUBST,NULL); /**/ - defun(ctx,"BUTLAST",mod,BUTLAST); - defun(ctx,"NBUTLAST",mod,NBUTLAST); - defun(ctx,"LIST",mod,LIST); - defun(ctx,"LIST*",mod,LIST_STAR); - defun(ctx,"MEMQ",mod,MEMQ); - defun(ctx,"MEMBER",mod,MEMBER); - defun(ctx,"SUPERMEMBER",mod,SUPERMEMBER); - defun(ctx,"ASSQ",mod,ASSQ); - defun(ctx,"ASSOC",mod,ASSOC); - defun(ctx,"SUPERASSOC",mod,SUPERASSOC); + defun(ctx,"BUTLAST",mod,BUTLAST,NULL); + defun(ctx,"NBUTLAST",mod,NBUTLAST,NULL); + defun(ctx,"LIST",mod,LIST,NULL); + defun(ctx,"LIST*",mod,LIST_STAR,NULL); + defun(ctx,"MEMQ",mod,MEMQ,NULL); + defun(ctx,"MEMBER",mod,MEMBER,NULL); + defun(ctx,"SUPERMEMBER",mod,SUPERMEMBER,NULL); + defun(ctx,"ASSQ",mod,ASSQ,NULL); + defun(ctx,"ASSOC",mod,ASSOC,NULL); + defun(ctx,"SUPERASSOC",mod,SUPERASSOC,NULL); } diff --git a/lisp/c/loadelf.c b/lisp/c/loadelf.c index b4d1d7093..18099d984 100644 --- a/lisp/c/loadelf.c +++ b/lisp/c/loadelf.c @@ -430,18 +430,18 @@ register context *ctx; pointer mod; { pointer p=Spevalof(PACKAGE); pointer_update(Spevalof(PACKAGE),syspkg); - defun(ctx,"SRCLOAD",mod,SRCLOAD); + defun(ctx,"SRCLOAD",mod,SRCLOAD,NULL); #if Solaris2 && !GCC - defun(ctx,"LIST-MODULE-INITIALIZERS",mod,list_module_initializers); + defun(ctx,"LIST-MODULE-INITIALIZERS",mod,list_module_initializers,NULL); #else - defun(ctx,"LIST-MODULE-INITIALIZERS",mod,list_module_initializers2); + defun(ctx,"LIST-MODULE-INITIALIZERS",mod,list_module_initializers2,NULL); #endif - defun(ctx,"FIND-ENTRY", mod, FIND_ENTRY); - defun(ctx,"FIND-ENTRY2", mod, FIND_ENTRY2); - defun(ctx,"SYSMOD", mod, SYSMOD); - defun(ctx,"BINLOAD",mod,BINLOAD); - defun(ctx,"UNBINLOAD",mod,UNBINLOAD); - defun(ctx,"SAVE",mod,SAVE); + defun(ctx,"FIND-ENTRY", mod, FIND_ENTRY,NULL); + defun(ctx,"FIND-ENTRY2", mod, FIND_ENTRY2,NULL); + defun(ctx,"SYSMOD", mod, SYSMOD,NULL); + defun(ctx,"BINLOAD",mod,BINLOAD,NULL); + defun(ctx,"UNBINLOAD",mod,UNBINLOAD,NULL); + defun(ctx,"SAVE",mod,SAVE,NULL); pointer_update(Spevalof(PACKAGE),p);} diff --git a/lisp/c/makes.c b/lisp/c/makes.c index 3e17340ff..609222998 100644 --- a/lisp/c/makes.c +++ b/lisp/c/makes.c @@ -604,12 +604,13 @@ long hi, lo; /* defines /****************************************************************/ -pointer defun(ctx,name,mod,f) +pointer defun(ctx,name,mod,f,doc) register context *ctx; char *name; pointer mod; pointer (*f)(); -{ register pointer sym,pkg; +char *doc; +{ register pointer sym,pkg,pdoc; #if defined(DEFUN_DEBUG) || defined(DEBUG_COUNT) static int count=0; @@ -621,7 +622,12 @@ pointer (*f)(); pkg=Spevalof(PACKAGE); sym=intern(ctx,name,strlen(name),pkg); - pointer_update(sym->c.sym.spefunc,makecode(mod,f,SUBR_FUNCTION)); + if (doc != NULL) { + pdoc = makestring(doc,strlen(doc)); + vpush(pdoc); + } + compfun(ctx, sym, mod, f, pdoc); + if (doc != NULL) vpop(); #ifdef DEFUN_DEBUG printf( "0x%lx\n", sym->c.sym.spefunc->c.code.entry ); #endif diff --git a/lisp/c/matrix.c b/lisp/c/matrix.c index d26664f77..089fa3d4f 100644 --- a/lisp/c/matrix.c +++ b/lisp/c/matrix.c @@ -1340,38 +1340,38 @@ register pointer mod; MK_Y=defkeyword(ctx,"-Y"); MK_Z=defkeyword(ctx,"-Z"); - defun(ctx,"V+",mod,VPLUS); - defun(ctx,"V++",mod,VPLUSPLUS); - defun(ctx,"V-",mod,VMINUS); - defun(ctx,"V-ABS",mod,VMINUS_ABS); - defun(ctx,"V.",mod,VINNERPRODUCT); - defun(ctx,"V*",mod,VCROSSPRODUCT); - defun(ctx,"V.*",mod,SCA3PROD); - defun(ctx,"V<",mod,VLESSP); - defun(ctx,"V>",mod,VGREATERP); - defun(ctx,"VMIN",mod,VMIN); - defun(ctx,"VMAX",mod,VMAX); - defun(ctx,"MINIMAL-BOX",mod,MINIMALBOX); - defun(ctx,"SCALE",mod,SCALEVEC); - defun(ctx,"NORM",mod,VNORM); - defun(ctx,"NORM2",mod,VNORM2); - defun(ctx,"NORMALIZE-VECTOR",mod,VNORMALIZE); - defun(ctx,"DISTANCE",mod,VDISTANCE); - defun(ctx,"DISTANCE2",mod,VDISTANCE2); - defun(ctx,"DIRECTION",mod,VDIRECTION); - defun(ctx,"MIDPOINT",mod,MIDPOINT); -/* defun(ctx,"TRIANGLE",mod,TRIANGLE); */ - defun(ctx,"FLOATVECTOR",mod,MKFLTVEC); - defun(ctx,"FLOAT-VECTOR",mod,MKFLTVEC); - defun(ctx,"TRANSFORM",mod,TRANSFORM); - defun(ctx,"M*",mod,MATTIMES); - defun(ctx,"ROTATE-VECTOR",mod,ROTVEC); - defun(ctx,"ROTATE-MATRIX",mod,ROTMAT); - defun(ctx,"ROTATION-MATRIX",mod,ROTATION_MATRIX); - defun(ctx,"ROTATION-ANGLE",mod,ROTANGLE); - defun(ctx,"TRANSPOSE",mod,TRANSPOSE); - defun(ctx,"RPY-ANGLE",mod,INV_RPY); - defun(ctx,"EULER-ANGLE",mod,INV_EULER); - defun(ctx,"LU-DECOMPOSE",mod,LU_DECOMPOSE); - defun(ctx,"LU-SOLVE",mod,LU_SOLVE); - defun(ctx,"LU-DETERMINANT",mod,LU_DETERMINANT);} + defun(ctx,"V+",mod,VPLUS,NULL); + defun(ctx,"V++",mod,VPLUSPLUS,NULL); + defun(ctx,"V-",mod,VMINUS,NULL); + defun(ctx,"V-ABS",mod,VMINUS_ABS,NULL); + defun(ctx,"V.",mod,VINNERPRODUCT,NULL); + defun(ctx,"V*",mod,VCROSSPRODUCT,NULL); + defun(ctx,"V.*",mod,SCA3PROD,NULL); + defun(ctx,"V<",mod,VLESSP,NULL); + defun(ctx,"V>",mod,VGREATERP,NULL); + defun(ctx,"VMIN",mod,VMIN,NULL); + defun(ctx,"VMAX",mod,VMAX,NULL); + defun(ctx,"MINIMAL-BOX",mod,MINIMALBOX,NULL); + defun(ctx,"SCALE",mod,SCALEVEC,NULL); + defun(ctx,"NORM",mod,VNORM,NULL); + defun(ctx,"NORM2",mod,VNORM2,NULL); + defun(ctx,"NORMALIZE-VECTOR",mod,VNORMALIZE,NULL); + defun(ctx,"DISTANCE",mod,VDISTANCE,NULL); + defun(ctx,"DISTANCE2",mod,VDISTANCE2,NULL); + defun(ctx,"DIRECTION",mod,VDIRECTION,NULL); + defun(ctx,"MIDPOINT",mod,MIDPOINT,NULL); +/* defun(ctx,"TRIANGLE",mod,TRIANGLE,NULL); */ + defun(ctx,"FLOATVECTOR",mod,MKFLTVEC,NULL); + defun(ctx,"FLOAT-VECTOR",mod,MKFLTVEC,NULL); + defun(ctx,"TRANSFORM",mod,TRANSFORM,NULL); + defun(ctx,"M*",mod,MATTIMES,NULL); + defun(ctx,"ROTATE-VECTOR",mod,ROTVEC,NULL); + defun(ctx,"ROTATE-MATRIX",mod,ROTMAT,NULL); + defun(ctx,"ROTATION-MATRIX",mod,ROTATION_MATRIX,NULL); + defun(ctx,"ROTATION-ANGLE",mod,ROTANGLE,NULL); + defun(ctx,"TRANSPOSE",mod,TRANSPOSE,NULL); + defun(ctx,"RPY-ANGLE",mod,INV_RPY,NULL); + defun(ctx,"EULER-ANGLE",mod,INV_EULER,NULL); + defun(ctx,"LU-DECOMPOSE",mod,LU_DECOMPOSE,NULL); + defun(ctx,"LU-SOLVE",mod,LU_SOLVE,NULL); + defun(ctx,"LU-DETERMINANT",mod,LU_DETERMINANT,NULL);} diff --git a/lisp/c/predicates.c b/lisp/c/predicates.c index 8d1275c09..c141c22f0 100644 --- a/lisp/c/predicates.c +++ b/lisp/c/predicates.c @@ -215,22 +215,22 @@ void predicates(ctx,mod) register context *ctx; register pointer mod; { /* preds*/ - defun(ctx,"ATOM",mod,ATOM); - QEQ=defun(ctx,"EQ",mod,EQ); + defun(ctx,"ATOM",mod,ATOM,NULL); + QEQ=defun(ctx,"EQ",mod,EQ,NULL); QEQ=QEQ->c.sym.spefunc; - defun(ctx,"EQL",mod,EQ); - defun(ctx,"NULL",mod,NILP); - QNOT=defun(ctx,"NOT",mod,NILP); - QEQUAL=defun(ctx,"EQUAL",mod,EQUAL); - defun(ctx,"SUPEREQUAL",mod,SUPEREQUAL); - defun(ctx,"SYMBOLP",mod,SYMBOLP); - defun(ctx,"STRINGP",mod,STRINGP); - defun(ctx,"LISTP",mod,LISTP); - defun(ctx,"CONSP",mod,CONSP); - defun(ctx,"ENDP",mod,ENDP); - defun(ctx,"NUMBERP",mod,NUMBERP); - defun(ctx,"INTEGERP",mod,INTEGERP); - defun(ctx,"FLOATP",mod,FLOATP); - defun(ctx,"BOUNDP",mod,BOUNDP); - defun(ctx,"FBOUNDP",mod,FBOUNDP); - defun(ctx,"STREAMP",mod,STREAMP); } + defun(ctx,"EQL",mod,EQ,NULL); + defun(ctx,"NULL",mod,NILP,NULL); + QNOT=defun(ctx,"NOT",mod,NILP,NULL); + QEQUAL=defun(ctx,"EQUAL",mod,EQUAL,NULL); + defun(ctx,"SUPEREQUAL",mod,SUPEREQUAL,NULL); + defun(ctx,"SYMBOLP",mod,SYMBOLP,NULL); + defun(ctx,"STRINGP",mod,STRINGP,NULL); + defun(ctx,"LISTP",mod,LISTP,NULL); + defun(ctx,"CONSP",mod,CONSP,NULL); + defun(ctx,"ENDP",mod,ENDP,NULL); + defun(ctx,"NUMBERP",mod,NUMBERP,NULL); + defun(ctx,"INTEGERP",mod,INTEGERP,NULL); + defun(ctx,"FLOATP",mod,FLOATP,NULL); + defun(ctx,"BOUNDP",mod,BOUNDP,NULL); + defun(ctx,"FBOUNDP",mod,FBOUNDP,NULL); + defun(ctx,"STREAMP",mod,STREAMP,NULL); } diff --git a/lisp/c/sequence.c b/lisp/c/sequence.c index 7e4630161..f2c856367 100644 --- a/lisp/c/sequence.c +++ b/lisp/c/sequence.c @@ -1069,15 +1069,15 @@ void sequence(ctx,mod) register context *ctx; pointer mod; { - QIDENTITY=defun(ctx,"IDENTITY",mod,IDENTITY); + QIDENTITY=defun(ctx,"IDENTITY",mod,IDENTITY,NULL); QIDENTITY=QIDENTITY->c.sym.spefunc; - defun(ctx,"SUBSEQ",mod,SUBSEQ); - defun(ctx,"COPY-SEQ",mod,COPYSEQ); - defun(ctx,"REVERSE",mod,REVERSE); - defun(ctx,"NREVERSE",mod,NREVERSE); - defun(ctx,"CONCATENATE",mod,CONCATENATE); - defun(ctx,"COERCE",mod,COERCE); - defun(ctx,"MAP",mod,MAP); + defun(ctx,"SUBSEQ",mod,SUBSEQ,NULL); + defun(ctx,"COPY-SEQ",mod,COPYSEQ,NULL); + defun(ctx,"REVERSE",mod,REVERSE,NULL); + defun(ctx,"NREVERSE",mod,NREVERSE,NULL); + defun(ctx,"CONCATENATE",mod,CONCATENATE,NULL); + defun(ctx,"COERCE",mod,COERCE,NULL); + defun(ctx,"MAP",mod,MAP,NULL); defunpkg(ctx,"RAW-FILL",mod,FILL,syspkg); defunpkg(ctx,"RAW-POSITION",mod,POSITION,syspkg); defunpkg(ctx,"RAW-FIND",mod,FIND,syspkg); @@ -1088,8 +1088,8 @@ pointer mod; defunpkg(ctx,"RAW-SUBSTITUTE",mod,SUBSTITUTE,syspkg); defunpkg(ctx,"RAW-NSUBSTITUTE",mod,NSUBSTITUTE,syspkg); defunpkg(ctx,"VECTOR-REPLACE",mod,VECREPLACE,syspkg); - defun(ctx,"SORT",mod,SORT); - defun(ctx,"LENGTH",mod,LENGTH); - defun(ctx,"ELT",mod,ELT); - defun(ctx,"SETELT",mod,SETELT); + defun(ctx,"SORT",mod,SORT,NULL); + defun(ctx,"LENGTH",mod,LENGTH,NULL); + defun(ctx,"ELT",mod,ELT,NULL); + defun(ctx,"SETELT",mod,SETELT,NULL); } diff --git a/lisp/c/specials.c b/lisp/c/specials.c index 242758d4f..915bd2df3 100644 --- a/lisp/c/specials.c +++ b/lisp/c/specials.c @@ -1287,15 +1287,15 @@ pointer mod; sysobj=cons(ctx,genhead,sysobj); QUOTE=defspecial(ctx,"QUOTE",mod,quote); - QEVAL=defun(ctx,"EVAL",mod,EVAL); - defun(ctx,"APPLY",mod,APPLY); - defun(ctx,"FUNCALL",mod,FUNCALL); + QEVAL=defun(ctx,"EVAL",mod,EVAL,NULL); + defun(ctx,"APPLY",mod,APPLY,NULL); + defun(ctx,"FUNCALL",mod,FUNCALL,NULL); QPROGN=defspecial(ctx,"PROGN",mod,progn); - defun(ctx,"PROG1",mod,PROG1); + defun(ctx,"PROG1",mod,PROG1,NULL); FUNCTION=defspecial(ctx,"FUNCTION",mod,FUNCTION_CLOSURE); - defun(ctx,"MAPC",mod,MAPC); - defun(ctx,"MAPCAR",mod,MAPCAR); - defun(ctx,"MAPCAN",mod,MAPCAN); + defun(ctx,"MAPC",mod,MAPC,NULL); + defun(ctx,"MAPCAR",mod,MAPCAR,NULL); + defun(ctx,"MAPCAN",mod,MAPCAN,NULL); defspecial(ctx,"SETQ",mod,SETQ); QIF=defspecial(ctx,"IF",mod,IF); defmacro(ctx,"WHEN",mod,WHEN); @@ -1313,37 +1313,37 @@ pointer mod; defmacro(ctx,"RETURN",mod,RETURN); defspecial(ctx,"TAGBODY",mod,TAGBODY); defspecial(ctx,"GO",mod,GO); - defun(ctx,"RESET",mod,RESET); - defun(ctx,"EVALHOOK",mod,EVALHOOK); - defun(ctx,"MACROEXPAND2",mod,MACEXPAND2); + defun(ctx,"RESET",mod,RESET,NULL); + defun(ctx,"EVALHOOK",mod,EVALHOOK,NULL); + defun(ctx,"MACROEXPAND2",mod,MACEXPAND2,NULL); defspecial(ctx,"EVAL-WHEN",mod,EVALWHEN); defspecial(ctx,"THE",mod,THE); QAND=defspecial(ctx,"AND",mod,AND); QOR=defspecial(ctx,"OR",mod,OR); - defun(ctx,"PROCLAIM",mod,PROCLAIM); + defun(ctx,"PROCLAIM",mod,PROCLAIM,NULL); defspecial(ctx,"DECLARE",mod,DECLARE); - defun(ctx,"SETFUNC",mod,SETFUNC); - defun(ctx,"SYMBOL-VALUE",mod,SYMVALUE); - defun(ctx,"SYMBOL-BOUND-VALUE",mod,SYMBNDVALUE); - defun(ctx,"SYMBOL-FUNCTION",mod,SYMFUNC); - defun(ctx,"MAKUNBOUND",mod,MAKUNBOUND); - defun(ctx,"SET",mod,SETSPECIAL); + defun(ctx,"SETFUNC",mod,SETFUNC,NULL); + defun(ctx,"SYMBOL-VALUE",mod,SYMVALUE,NULL); + defun(ctx,"SYMBOL-BOUND-VALUE",mod,SYMBNDVALUE,NULL); + defun(ctx,"SYMBOL-FUNCTION",mod,SYMFUNC,NULL); + defun(ctx,"MAKUNBOUND",mod,MAKUNBOUND,NULL); + defun(ctx,"SET",mod,SETSPECIAL,NULL); defspecial(ctx,"DEFUN",mod,DEFUN); defspecial(ctx,"DEFMACRO",mod,DEFMACRO); - defun(ctx,"FIND-SYMBOL",mod,FINDSYMBOL); - defun(ctx,"INTERN",mod,INTERN); - defun(ctx,"GENSYM",mod,GENSYM); - defun(ctx,"LIST-ALL-PACKAGES",mod,ALLPACKAGES); - defun(ctx,"FIND-PACKAGE",mod,FINDPACKAGE); + defun(ctx,"FIND-SYMBOL",mod,FINDSYMBOL,NULL); + defun(ctx,"INTERN",mod,INTERN,NULL); + defun(ctx,"GENSYM",mod,GENSYM,NULL); + defun(ctx,"LIST-ALL-PACKAGES",mod,ALLPACKAGES,NULL); + defun(ctx,"FIND-PACKAGE",mod,FINDPACKAGE,NULL); defunpkg(ctx,"MAKEPACKAGE",mod,MAKEPACKAGE,syspkg); -/* defun(ctx,"IN-PACKAGE",mod,INPACKAGE); */ - defun(ctx,"SXHASH",mod,SXHASH); - defun(ctx,"GET",mod,GETPROP); - defun(ctx,"EXPORT",mod,EXPORT); - defun(ctx,"PUTPROP",mod,PUTPROP); +/* defun(ctx,"IN-PACKAGE",mod,INPACKAGE,NULL); */ + defun(ctx,"SXHASH",mod,SXHASH,NULL); + defun(ctx,"GET",mod,GETPROP,NULL); + defun(ctx,"EXPORT",mod,EXPORT,NULL); + defun(ctx,"PUTPROP",mod,PUTPROP,NULL); #ifdef EVAL_DEBUG - defun(ctx,"EVALDEBUG",mod,EVALDEBUG); + defun(ctx,"EVALDEBUG",mod,EVALDEBUG,NULL); #endif } diff --git a/lisp/c/sysfunc.c b/lisp/c/sysfunc.c index 62dee1a5d..b7fbb16da 100644 --- a/lisp/c/sysfunc.c +++ b/lisp/c/sysfunc.c @@ -775,35 +775,35 @@ pointer mod; pointer_update(Spevalof(PACKAGE),syspkg); - defun(ctx,"SBCOUNT",mod,SBCOUNT); - defun(ctx,"GC",mod,GEESEE); - defun(ctx,"GCTIME",mod,GCTIME); - defun(ctx,"ALLOC",mod,ALLOC); - defun(ctx,"NEWSTACK",mod,NEWSTACK); - defun(ctx,"RECLAIM",mod,RECLAIM); - defun(ctx,"RECLAIM-TREE",mod,RECLTREE); - defun(ctx,"OBJECT-SIZE",mod,OBJSIZE); - defun(ctx,"BKTRACE",mod,BKTRACE); - defun(ctx,"MEMORY-REPORT",mod,MEMORY_REPORT); - defun(ctx,"CLEAR-MEMORY-REPORT",mod,CLEAR_ALLOCCOUNT); - defun(ctx,"ROOM",mod,ROOM); - defun(ctx,"FREE-COUNT",mod,FREE_COUNTS); - defun(ctx,"LIST-ALL-CHUNKS",mod,LIST_ALL_CHUNKS); - defun(ctx,"LIST-ALL-INSTANCES",mod,INSTANCELIST); - defun(ctx,"ADDRESS",mod,ADDRESS); - defun(ctx,"PEEK",mod,PEEK); - defun(ctx,"POKE",mod,POKE); -/* defun(ctx,"MALLOC_DEBUG",mod,MALLOC_DEBUG); -/* defun(ctx,"MALLOC_VERIFY",mod,MALLOC_VERIFY); */ - defun(ctx,"LIST-ALL-REFERENCES",mod,LISTALLREFERENCES); - defun(ctx,"LIST-ALL-CATCHERS",mod,LISTALLCATCHERS); - defun(ctx,"LIST-ALL-BINDINGS",mod,LISTBINDINGS); - defun(ctx,"LIST-ALL-SPECIAL-BINDINGS",mod,LISTSPECIALBINDINGS); - defun(ctx,"LIST-ALL-CLASSES",mod,LISTALLCLASSES); - defun(ctx,"EXPORT-ALL-SYMBOLS", mod, EXPORTALL); - defun(ctx,"NEXT-SPECIAL-INDEX", mod, NEXT_SPECIAL_INDEX); - defun(ctx,"THREAD-SPECIALS", mod, THREAD_SPECIALS); - defun(ctx,"DISPOSE-HOOK", mod, DISPOSE_HOOK); + defun(ctx,"SBCOUNT",mod,SBCOUNT,NULL); + defun(ctx,"GC",mod,GEESEE,NULL); + defun(ctx,"GCTIME",mod,GCTIME,NULL); + defun(ctx,"ALLOC",mod,ALLOC,NULL); + defun(ctx,"NEWSTACK",mod,NEWSTACK,NULL); + defun(ctx,"RECLAIM",mod,RECLAIM,NULL); + defun(ctx,"RECLAIM-TREE",mod,RECLTREE,NULL); + defun(ctx,"OBJECT-SIZE",mod,OBJSIZE,NULL); + defun(ctx,"BKTRACE",mod,BKTRACE,NULL); + defun(ctx,"MEMORY-REPORT",mod,MEMORY_REPORT,NULL); + defun(ctx,"CLEAR-MEMORY-REPORT",mod,CLEAR_ALLOCCOUNT,NULL); + defun(ctx,"ROOM",mod,ROOM,NULL); + defun(ctx,"FREE-COUNT",mod,FREE_COUNTS,NULL); + defun(ctx,"LIST-ALL-CHUNKS",mod,LIST_ALL_CHUNKS,NULL); + defun(ctx,"LIST-ALL-INSTANCES",mod,INSTANCELIST,NULL); + defun(ctx,"ADDRESS",mod,ADDRESS,NULL); + defun(ctx,"PEEK",mod,PEEK,NULL); + defun(ctx,"POKE",mod,POKE,NULL); +/* defun(ctx,"MALLOC_DEBUG",mod,MALLOC_DEBUG,NULL); +/* defun(ctx,"MALLOC_VERIFY",mod,MALLOC_VERIFY,NULL); */ + defun(ctx,"LIST-ALL-REFERENCES",mod,LISTALLREFERENCES,NULL); + defun(ctx,"LIST-ALL-CATCHERS",mod,LISTALLCATCHERS,NULL); + defun(ctx,"LIST-ALL-BINDINGS",mod,LISTBINDINGS,NULL); + defun(ctx,"LIST-ALL-SPECIAL-BINDINGS",mod,LISTSPECIALBINDINGS,NULL); + defun(ctx,"LIST-ALL-CLASSES",mod,LISTALLCLASSES,NULL); + defun(ctx,"EXPORT-ALL-SYMBOLS", mod, EXPORTALL,NULL); + defun(ctx,"NEXT-SPECIAL-INDEX", mod, NEXT_SPECIAL_INDEX,NULL); + defun(ctx,"THREAD-SPECIALS", mod, THREAD_SPECIALS,NULL); + defun(ctx,"DISPOSE-HOOK", mod, DISPOSE_HOOK,NULL); /* restore package*/ pointer_update(Spevalof(PACKAGE),p); } diff --git a/lisp/c/unixcall.c b/lisp/c/unixcall.c index e228f14c0..c9fd06c5c 100644 --- a/lisp/c/unixcall.c +++ b/lisp/c/unixcall.c @@ -1994,161 +1994,161 @@ pointer mod; Spevalof(PACKAGE)=unixpkg; /* common to unix and to vxworks */ - defun(ctx,"SIGADDSET",mod,SIGADDSET); - defun(ctx,"SIGDELSET",mod,SIGDELSET); - defun(ctx,"SIGPROCMASK",mod,SIGPROCMASK); - defun(ctx,"KILL",mod,KILL); - defun(ctx,"SIGNAL",mod,SIGNAL); - defun(ctx,"EXIT",mod,EXIT); - defun(ctx,"_EXIT",mod,_EXIT); - defun(ctx,"GETPID",mod,GETPID); - defun(ctx,"UREAD",mod,UNIXREAD); - defun(ctx,"WRITE",mod,UNIXWRITE); - defun(ctx,"UCLOSE",mod,UNIXCLOSE); - defun(ctx,"IOCTL",mod,IOCTL); - defun(ctx,"LSEEK",mod,LSEEK); - defun(ctx,"SBRK",mod,SBRK); - defun(ctx,"MALLOC",mod,MALLOC); - defun(ctx,"FREE",mod,FREE); - - defun(ctx,"SOCKET",mod,SOCKET); - defun(ctx,"BIND",mod,BIND); - defun(ctx,"CONNECT",mod,CONNECT); - defun(ctx,"LISTEN",mod,LISTEN); - defun(ctx,"ACCEPT",mod,ACCEPT); - defun(ctx,"SENDTO",mod,SENDTO); - defun(ctx,"RECVFROM",mod,RECVFROM); + defun(ctx,"SIGADDSET",mod,SIGADDSET,NULL); + defun(ctx,"SIGDELSET",mod,SIGDELSET,NULL); + defun(ctx,"SIGPROCMASK",mod,SIGPROCMASK,NULL); + defun(ctx,"KILL",mod,KILL,NULL); + defun(ctx,"SIGNAL",mod,SIGNAL,NULL); + defun(ctx,"EXIT",mod,EXIT,NULL); + defun(ctx,"_EXIT",mod,_EXIT,NULL); + defun(ctx,"GETPID",mod,GETPID,NULL); + defun(ctx,"UREAD",mod,UNIXREAD,NULL); + defun(ctx,"WRITE",mod,UNIXWRITE,NULL); + defun(ctx,"UCLOSE",mod,UNIXCLOSE,NULL); + defun(ctx,"IOCTL",mod,IOCTL,NULL); + defun(ctx,"LSEEK",mod,LSEEK,NULL); + defun(ctx,"SBRK",mod,SBRK,NULL); + defun(ctx,"MALLOC",mod,MALLOC,NULL); + defun(ctx,"FREE",mod,FREE,NULL); + + defun(ctx,"SOCKET",mod,SOCKET,NULL); + defun(ctx,"BIND",mod,BIND,NULL); + defun(ctx,"CONNECT",mod,CONNECT,NULL); + defun(ctx,"LISTEN",mod,LISTEN,NULL); + defun(ctx,"ACCEPT",mod,ACCEPT,NULL); + defun(ctx,"SENDTO",mod,SENDTO,NULL); + defun(ctx,"RECVFROM",mod,RECVFROM,NULL); #if !Solaris2 - defun(ctx,"GETPEERNAME",mod,GETPEERNAME); + defun(ctx,"GETPEERNAME",mod,GETPEERNAME,NULL); #endif /* #endif /*socket*/ /*not supported by vxworks*/ #if !vxworks - defun(ctx,"PTIMES",mod,PTIMES); - defun(ctx,"RUNTIME",mod,RUNTIME); - defun(ctx,"LOCALTIME",mod,LOCALTIME); - defun(ctx,"ASCTIME",mod,ASCTIME); - defun(ctx,"GETITIMER",mod,GETITIMER); - defun(ctx,"SETITIMER",mod,SETITIMER); + defun(ctx,"PTIMES",mod,PTIMES,NULL); + defun(ctx,"RUNTIME",mod,RUNTIME,NULL); + defun(ctx,"LOCALTIME",mod,LOCALTIME,NULL); + defun(ctx,"ASCTIME",mod,ASCTIME,NULL); + defun(ctx,"GETITIMER",mod,GETITIMER,NULL); + defun(ctx,"SETITIMER",mod,SETITIMER,NULL); #if !Solaris2 - defun(ctx,"GETRUSAGE",mod,GETRUSAGE); - defun(ctx,"GETPAGESIZE",mod,GETPAGESIZE); + defun(ctx,"GETRUSAGE",mod,GETRUSAGE,NULL); + defun(ctx,"GETPAGESIZE",mod,GETPAGESIZE,NULL); #endif - defun(ctx,"GETTIMEOFDAY",mod,GETTIMEOFDAY); - defun(ctx,"ALARM",mod,ALARM); + defun(ctx,"GETTIMEOFDAY",mod,GETTIMEOFDAY,NULL); + defun(ctx,"ALARM",mod,ALARM,NULL); #if sun3 || sun4 || news || sanyo || alpha || x86_64 || ARM /* why i386 does not exist? */ #if !Solaris2 - defun(ctx,"UALARM",mod,UALARM); + defun(ctx,"UALARM",mod,UALARM,NULL); #endif #endif - defun(ctx,"WAIT",mod,WAIT); - defun(ctx,"FORK",mod,FORK); + defun(ctx,"WAIT",mod,WAIT,NULL); + defun(ctx,"FORK",mod,FORK,NULL); #if Solaris2 - defun(ctx,"FORK1",mod,FORK1); -#endif - defun(ctx,"GETPPID",mod,GETPPID); - defun(ctx,"GETPGRP",mod,GETPGRP); - defun(ctx,"SETPGRP",mod,SETPGRP); - defun(ctx,"GETUID",mod,GETUID); - defun(ctx,"GETEUID",mod,GETEUID); - defun(ctx,"GETGID",mod,GETGID); - defun(ctx,"GETEGID",mod,GETEGID); - defun(ctx,"SETUID",mod,SETUID); - defun(ctx,"SETGID",mod,SETGID); - defun(ctx,"MKNOD",mod,MKNOD); - defun(ctx,"MKDIR",mod,MKDIR); + defun(ctx,"FORK1",mod,FORK1,NULL); +#endif + defun(ctx,"GETPPID",mod,GETPPID,NULL); + defun(ctx,"GETPGRP",mod,GETPGRP,NULL); + defun(ctx,"SETPGRP",mod,SETPGRP,NULL); + defun(ctx,"GETUID",mod,GETUID,NULL); + defun(ctx,"GETEUID",mod,GETEUID,NULL); + defun(ctx,"GETGID",mod,GETGID,NULL); + defun(ctx,"GETEGID",mod,GETEGID,NULL); + defun(ctx,"SETUID",mod,SETUID,NULL); + defun(ctx,"SETGID",mod,SETGID,NULL); + defun(ctx,"MKNOD",mod,MKNOD,NULL); + defun(ctx,"MKDIR",mod,MKDIR,NULL); #if !Cygwin /* Cygwin does not have LOCKF */ - defun(ctx,"LOCKF",mod,LOCKF); + defun(ctx,"LOCKF",mod,LOCKF,NULL); #endif - defun(ctx,"FCNTL",mod,FCNTL); + defun(ctx,"FCNTL",mod,FCNTL,NULL); #if !Solaris2 - defun(ctx,"IOCTL_",mod,IOCTL_); - defun(ctx,"IOCTL_R",mod,IOCTL_R); - defun(ctx,"IOCTL_W",mod,IOCTL_W); + defun(ctx,"IOCTL_",mod,IOCTL_,NULL); + defun(ctx,"IOCTL_R",mod,IOCTL_R,NULL); + defun(ctx,"IOCTL_W",mod,IOCTL_W,NULL); #if !Cygwin /* Cygwin does not have IOCTL_WR */ - defun(ctx,"IOCTL_WR",mod,IOCTL_WR); -#endif -#endif - defun(ctx,"DUP",mod,DUP); - defun(ctx,"DUP2",mod,DUP2); - defun(ctx,"SYSTEM",mod,SYSTEM); - defun(ctx,"GETWD",mod,GETWD); - defun(ctx,"GETENV",mod,GETENV); - defun(ctx,"ENVIRON",mod,ENVIRON); - defun(ctx,"SLEEP",mod,SLEEP); - defun(ctx,"ERRNO",mod,ERRNO); - defun(ctx,"PERROR",mod,PERROR); - defun(ctx,"SYSERRLIST",mod,SYSERRLIST); - defun(ctx,"PAUSE",mod,PAUSE); - defun(ctx,"ISATTY",mod,ISATTY); - defun(ctx,"LINK",mod,LINK); - defun(ctx,"UNLINK",mod,UNLINK); - defun(ctx,"RMDIR",mod,RMDIR); - defun(ctx,"RENAME",mod,RENAME); - defun(ctx,"ACCESS",mod,ACCESS); -/* defun(ctx,"FLOCK",mod,FLOCK); */ - defun(ctx,"STAT",mod,STAT); - defun(ctx,"CHDIR",mod,CHDIR); - defun(ctx,"CHMOD",mod,CHMOD); - defun(ctx,"CHOWN",mod,CHOWN); - defun(ctx,"PIPE",mod,PIPE); - defun(ctx,"SELECT",mod,SELECT); - defun(ctx,"SELECT-READ-FD",mod,SELECT_READ); - defun(ctx,"READDIR",mod,DIRECTORY); + defun(ctx,"IOCTL_WR",mod,IOCTL_WR,NULL); +#endif +#endif + defun(ctx,"DUP",mod,DUP,NULL); + defun(ctx,"DUP2",mod,DUP2,NULL); + defun(ctx,"SYSTEM",mod,SYSTEM,NULL); + defun(ctx,"GETWD",mod,GETWD,NULL); + defun(ctx,"GETENV",mod,GETENV,NULL); + defun(ctx,"ENVIRON",mod,ENVIRON,NULL); + defun(ctx,"SLEEP",mod,SLEEP,NULL); + defun(ctx,"ERRNO",mod,ERRNO,NULL); + defun(ctx,"PERROR",mod,PERROR,NULL); + defun(ctx,"SYSERRLIST",mod,SYSERRLIST,NULL); + defun(ctx,"PAUSE",mod,PAUSE,NULL); + defun(ctx,"ISATTY",mod,ISATTY,NULL); + defun(ctx,"LINK",mod,LINK,NULL); + defun(ctx,"UNLINK",mod,UNLINK,NULL); + defun(ctx,"RMDIR",mod,RMDIR,NULL); + defun(ctx,"RENAME",mod,RENAME,NULL); + defun(ctx,"ACCESS",mod,ACCESS,NULL); +/* defun(ctx,"FLOCK",mod,FLOCK,NULL); */ + defun(ctx,"STAT",mod,STAT,NULL); + defun(ctx,"CHDIR",mod,CHDIR,NULL); + defun(ctx,"CHMOD",mod,CHMOD,NULL); + defun(ctx,"CHOWN",mod,CHOWN,NULL); + defun(ctx,"PIPE",mod,PIPE,NULL); + defun(ctx,"SELECT",mod,SELECT,NULL); + defun(ctx,"SELECT-READ-FD",mod,SELECT_READ,NULL); + defun(ctx,"READDIR",mod,DIRECTORY,NULL); #if !vxworks - defun(ctx,"GETHOSTNAME",mod,GETHOSTNAME); - defun(ctx,"GETHOSTBYNAME",mod,GETHOSTBYNAME); - defun(ctx,"GETHOSTBYADDR",mod,GETHOSTBYADDR); + defun(ctx,"GETHOSTNAME",mod,GETHOSTNAME,NULL); + defun(ctx,"GETHOSTBYNAME",mod,GETHOSTBYNAME,NULL); + defun(ctx,"GETHOSTBYADDR",mod,GETHOSTBYADDR,NULL); #if !Cygwin /* Cygwin does not have GETNETBYNMAE */ - defun(ctx,"GETNETBYNAME",mod,GETNETBYNAME); + defun(ctx,"GETNETBYNAME",mod,GETNETBYNAME,NULL); #endif - defun(ctx,"GETPROTOBYNAME",mod,GETPROTOBYNAME); - defun(ctx,"GETSERVBYNAME",mod,GETSERVBYNAME); + defun(ctx,"GETPROTOBYNAME",mod,GETPROTOBYNAME,NULL); + defun(ctx,"GETSERVBYNAME",mod,GETSERVBYNAME,NULL); /* Append by I.Hara for IPC */ - defun(ctx,"HTONS",mod,H2NS); - defun(ctx,"NTOHS",mod,N2HS); + defun(ctx,"HTONS",mod,H2NS,NULL); + defun(ctx,"NTOHS",mod,N2HS,NULL); #endif #if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64 || ARM - defun(ctx,"VFORK",mod,VFORK); + defun(ctx,"VFORK",mod,VFORK,NULL); #endif - defun(ctx,"EXEC",mod,EXEC); + defun(ctx,"EXEC",mod,EXEC,NULL); #if !Solaris2 && !Cygwin - defun(ctx,"GETPRIORITY",mod,GETPRIORITY); - defun(ctx,"SETPRIORITY",mod,SETPRIORITY); + defun(ctx,"GETPRIORITY",mod,GETPRIORITY,NULL); + defun(ctx,"SETPRIORITY",mod,SETPRIORITY,NULL); #endif #if sun3 || sun4 || vax || mips || i386 || alpha || x86_64 || ARM - defun(ctx,"PUTENV",mod,PUTENV); + defun(ctx,"PUTENV",mod,PUTENV,NULL); #endif #if sun3 || sun4 && !Solaris2 || Linux || alpha || Cygwin - defun(ctx,"USLEEP",mod,USLEEP); + defun(ctx,"USLEEP",mod,USLEEP,NULL); #endif #if !news - defun(ctx,"MSGGET",mod,MSGGET); - defun(ctx,"MSGSND",mod,MSGSND); - defun(ctx,"MSGRCV",mod,MSGRCV); - defun(ctx,"MSGCTL",mod,MSGCTL); + defun(ctx,"MSGGET",mod,MSGGET,NULL); + defun(ctx,"MSGSND",mod,MSGSND,NULL); + defun(ctx,"MSGRCV",mod,MSGRCV,NULL); + defun(ctx,"MSGCTL",mod,MSGCTL,NULL); #endif #if sun3 || sun4 || news || alpha - defun(ctx,"VALLOC",mod,VALLOC); + defun(ctx,"VALLOC",mod,VALLOC,NULL); #endif #if sun3 || sun4 || news || alpha || Linux || Cygwin - defun(ctx,"MMAP",mod,MMAP); - defun(ctx,"MUNMAP",mod,MUNMAP); -/* defun(ctx,"VADVISE",mod,VADVISE); */ + defun(ctx,"MMAP",mod,MMAP,NULL); + defun(ctx,"MUNMAP",mod,MUNMAP,NULL); +/* defun(ctx,"VADVISE",mod,VADVISE,NULL); */ #endif #if system5 || Linux || Cygwin - defun(ctx,"UNAME",mod,UNAME); + defun(ctx,"UNAME",mod,UNAME,NULL); #endif #endif /*socket*/ @@ -2156,15 +2156,15 @@ pointer mod; /*ndbm libraries*/ #ifdef DBM #if sun3 || sun4 - defun(ctx,"DBM-OPEN",mod,DBM_OPEN); - defun(ctx,"DBM-CLOSE",mod,DBM_CLOSE); - defun(ctx,"DBM-FETCH",mod,DBM_FETCH); - defun(ctx,"DBM-STORE",mod,DBM_STORE); - defun(ctx,"DBM-DELETE",mod,DBM_DELETE); - defun(ctx,"DBM-FIRSTKEY",mod,DBM_FIRSTKEY); - defun(ctx,"DBM-NEXTKEY",mod,DBM_NEXTKEY); - defun(ctx,"DBM-ERROR",mod,DBM_ERROR); - defun(ctx,"DBM-CLEARERR",mod,DBM_CLEARERR); + defun(ctx,"DBM-OPEN",mod,DBM_OPEN,NULL); + defun(ctx,"DBM-CLOSE",mod,DBM_CLOSE,NULL); + defun(ctx,"DBM-FETCH",mod,DBM_FETCH,NULL); + defun(ctx,"DBM-STORE",mod,DBM_STORE,NULL); + defun(ctx,"DBM-DELETE",mod,DBM_DELETE,NULL); + defun(ctx,"DBM-FIRSTKEY",mod,DBM_FIRSTKEY,NULL); + defun(ctx,"DBM-NEXTKEY",mod,DBM_NEXTKEY,NULL); + defun(ctx,"DBM-ERROR",mod,DBM_ERROR,NULL); + defun(ctx,"DBM-CLEARERR",mod,DBM_CLEARERR,NULL); #endif #endif diff --git a/lisp/c/unixcall.old.c b/lisp/c/unixcall.old.c index 2c2403d14..b0bb3df87 100644 --- a/lisp/c/unixcall.old.c +++ b/lisp/c/unixcall.old.c @@ -1893,153 +1893,153 @@ pointer mod; Spevalof(PACKAGE)=unixpkg; /* common to unix and to vxworks */ - defun(ctx,"SIGADDSET",mod,SIGADDSET); - defun(ctx,"SIGDELSET",mod,SIGDELSET); - defun(ctx,"SIGPROCMASK",mod,SIGPROCMASK); - defun(ctx,"KILL",mod,KILL); - defun(ctx,"SIGNAL",mod,SIGNAL); - defun(ctx,"EXIT",mod,EXIT); - defun(ctx,"GETPID",mod,GETPID); - defun(ctx,"UREAD",mod,UNIXREAD); - defun(ctx,"WRITE",mod,UNIXWRITE); - defun(ctx,"UCLOSE",mod,UNIXCLOSE); - defun(ctx,"IOCTL",mod,IOCTL); - defun(ctx,"LSEEK",mod,LSEEK); - defun(ctx,"SBRK",mod,SBRK); - defun(ctx,"MALLOC",mod,MALLOC); - defun(ctx,"FREE",mod,FREE); - - defun(ctx,"SOCKET",mod,SOCKET); - defun(ctx,"BIND",mod,BIND); - defun(ctx,"CONNECT",mod,CONNECT); - defun(ctx,"LISTEN",mod,LISTEN); - defun(ctx,"ACCEPT",mod,ACCEPT); - defun(ctx,"SENDTO",mod,SENDTO); - defun(ctx,"RECVFROM",mod,RECVFROM); + defun(ctx,"SIGADDSET",mod,SIGADDSET,NULL); + defun(ctx,"SIGDELSET",mod,SIGDELSET,NULL); + defun(ctx,"SIGPROCMASK",mod,SIGPROCMASK,NULL); + defun(ctx,"KILL",mod,KILL,NULL); + defun(ctx,"SIGNAL",mod,SIGNAL,NULL); + defun(ctx,"EXIT",mod,EXIT,NULL); + defun(ctx,"GETPID",mod,GETPID,NULL); + defun(ctx,"UREAD",mod,UNIXREAD,NULL); + defun(ctx,"WRITE",mod,UNIXWRITE,NULL); + defun(ctx,"UCLOSE",mod,UNIXCLOSE,NULL); + defun(ctx,"IOCTL",mod,IOCTL,NULL); + defun(ctx,"LSEEK",mod,LSEEK,NULL); + defun(ctx,"SBRK",mod,SBRK,NULL); + defun(ctx,"MALLOC",mod,MALLOC,NULL); + defun(ctx,"FREE",mod,FREE,NULL); + + defun(ctx,"SOCKET",mod,SOCKET,NULL); + defun(ctx,"BIND",mod,BIND,NULL); + defun(ctx,"CONNECT",mod,CONNECT,NULL); + defun(ctx,"LISTEN",mod,LISTEN,NULL); + defun(ctx,"ACCEPT",mod,ACCEPT,NULL); + defun(ctx,"SENDTO",mod,SENDTO,NULL); + defun(ctx,"RECVFROM",mod,RECVFROM,NULL); #if !Solaris2 - defun(ctx,"GETPEERNAME",mod,GETPEERNAME); + defun(ctx,"GETPEERNAME",mod,GETPEERNAME,NULL); #endif /* #endif /*socket*/ /*not supported by vxworks*/ #if !vxworks - defun(ctx,"PTIMES",mod,PTIMES); - defun(ctx,"RUNTIME",mod,RUNTIME); - defun(ctx,"LOCALTIME",mod,LOCALTIME); - defun(ctx,"ASCTIME",mod,ASCTIME); - defun(ctx,"GETITIMER",mod,GETITIMER); - defun(ctx,"SETITIMER",mod,SETITIMER); + defun(ctx,"PTIMES",mod,PTIMES,NULL); + defun(ctx,"RUNTIME",mod,RUNTIME,NULL); + defun(ctx,"LOCALTIME",mod,LOCALTIME,NULL); + defun(ctx,"ASCTIME",mod,ASCTIME,NULL); + defun(ctx,"GETITIMER",mod,GETITIMER,NULL); + defun(ctx,"SETITIMER",mod,SETITIMER,NULL); #if !Solaris2 - defun(ctx,"GETRUSAGE",mod,GETRUSAGE); - defun(ctx,"GETPAGESIZE",mod,GETPAGESIZE); + defun(ctx,"GETRUSAGE",mod,GETRUSAGE,NULL); + defun(ctx,"GETPAGESIZE",mod,GETPAGESIZE,NULL); #endif - defun(ctx,"GETTIMEOFDAY",mod,GETTIMEOFDAY); - defun(ctx,"ALARM",mod,ALARM); + defun(ctx,"GETTIMEOFDAY",mod,GETTIMEOFDAY,NULL); + defun(ctx,"ALARM",mod,ALARM,NULL); #if sun3 || sun4 || news || sanyo || alpha #if !Solaris2 - defun(ctx,"UALARM",mod,UALARM); + defun(ctx,"UALARM",mod,UALARM,NULL); #endif #endif - defun(ctx,"WAIT",mod,WAIT); - defun(ctx,"FORK",mod,FORK); + defun(ctx,"WAIT",mod,WAIT,NULL); + defun(ctx,"FORK",mod,FORK,NULL); #if Solaris2 - defun(ctx,"FORK1",mod,FORK1); + defun(ctx,"FORK1",mod,FORK1,NULL); #endif - defun(ctx,"GETPPID",mod,GETPPID); - defun(ctx,"GETPGRP",mod,GETPGRP); - defun(ctx,"SETPGRP",mod,SETPGRP); - defun(ctx,"GETUID",mod,GETUID); - defun(ctx,"GETEUID",mod,GETEUID); - defun(ctx,"GETGID",mod,GETGID); - defun(ctx,"GETEGID",mod,GETEGID); - defun(ctx,"SETUID",mod,SETUID); - defun(ctx,"SETGID",mod,SETGID); - defun(ctx,"MKNOD",mod,MKNOD); - defun(ctx,"MKDIR",mod,MKDIR); - defun(ctx,"LOCKF",mod,LOCKF); - defun(ctx,"FCNTL",mod,FCNTL); + defun(ctx,"GETPPID",mod,GETPPID,NULL); + defun(ctx,"GETPGRP",mod,GETPGRP,NULL); + defun(ctx,"SETPGRP",mod,SETPGRP,NULL); + defun(ctx,"GETUID",mod,GETUID,NULL); + defun(ctx,"GETEUID",mod,GETEUID,NULL); + defun(ctx,"GETGID",mod,GETGID,NULL); + defun(ctx,"GETEGID",mod,GETEGID,NULL); + defun(ctx,"SETUID",mod,SETUID,NULL); + defun(ctx,"SETGID",mod,SETGID,NULL); + defun(ctx,"MKNOD",mod,MKNOD,NULL); + defun(ctx,"MKDIR",mod,MKDIR,NULL); + defun(ctx,"LOCKF",mod,LOCKF,NULL); + defun(ctx,"FCNTL",mod,FCNTL,NULL); #if !Solaris2 - defun(ctx,"IOCTL_",mod,IOCTL_); - defun(ctx,"IOCTL_R",mod,IOCTL_R); - defun(ctx,"IOCTL_W",mod,IOCTL_W); - defun(ctx,"IOCTL_WR",mod,IOCTL_WR); + defun(ctx,"IOCTL_",mod,IOCTL_,NULL); + defun(ctx,"IOCTL_R",mod,IOCTL_R,NULL); + defun(ctx,"IOCTL_W",mod,IOCTL_W,NULL); + defun(ctx,"IOCTL_WR",mod,IOCTL_WR,NULL); #endif - defun(ctx,"DUP",mod,DUP); - defun(ctx,"DUP2",mod,DUP2); - defun(ctx,"SYSTEM",mod,SYSTEM); - defun(ctx,"GETWD",mod,GETWD); - defun(ctx,"GETENV",mod,GETENV); - defun(ctx,"ENVIRON",mod,ENVIRON); - defun(ctx,"SLEEP",mod,SLEEP); - defun(ctx,"ERRNO",mod,ERRNO); - defun(ctx,"SYSERRLIST",mod,SYSERRLIST); - defun(ctx,"PAUSE",mod,PAUSE); - defun(ctx,"ISATTY",mod,ISATTY); - defun(ctx,"LINK",mod,LINK); - defun(ctx,"UNLINK",mod,UNLINK); - defun(ctx,"RMDIR",mod,RMDIR); - defun(ctx,"RENAME",mod,RENAME); - defun(ctx,"ACCESS",mod,ACCESS); -/* defun(ctx,"FLOCK",mod,FLOCK); */ - defun(ctx,"STAT",mod,STAT); - defun(ctx,"CHDIR",mod,CHDIR); - defun(ctx,"CHMOD",mod,CHMOD); - defun(ctx,"CHOWN",mod,CHOWN); - defun(ctx,"PIPE",mod,PIPE); - defun(ctx,"SELECT",mod,SELECT); - defun(ctx,"SELECT-READ-FD",mod,SELECT_READ); - defun(ctx,"READDIR",mod,DIRECTORY); + defun(ctx,"DUP",mod,DUP,NULL); + defun(ctx,"DUP2",mod,DUP2,NULL); + defun(ctx,"SYSTEM",mod,SYSTEM,NULL); + defun(ctx,"GETWD",mod,GETWD,NULL); + defun(ctx,"GETENV",mod,GETENV,NULL); + defun(ctx,"ENVIRON",mod,ENVIRON,NULL); + defun(ctx,"SLEEP",mod,SLEEP,NULL); + defun(ctx,"ERRNO",mod,ERRNO,NULL); + defun(ctx,"SYSERRLIST",mod,SYSERRLIST,NULL); + defun(ctx,"PAUSE",mod,PAUSE,NULL); + defun(ctx,"ISATTY",mod,ISATTY,NULL); + defun(ctx,"LINK",mod,LINK,NULL); + defun(ctx,"UNLINK",mod,UNLINK,NULL); + defun(ctx,"RMDIR",mod,RMDIR,NULL); + defun(ctx,"RENAME",mod,RENAME,NULL); + defun(ctx,"ACCESS",mod,ACCESS,NULL); +/* defun(ctx,"FLOCK",mod,FLOCK,NULL); */ + defun(ctx,"STAT",mod,STAT,NULL); + defun(ctx,"CHDIR",mod,CHDIR,NULL); + defun(ctx,"CHMOD",mod,CHMOD,NULL); + defun(ctx,"CHOWN",mod,CHOWN,NULL); + defun(ctx,"PIPE",mod,PIPE,NULL); + defun(ctx,"SELECT",mod,SELECT,NULL); + defun(ctx,"SELECT-READ-FD",mod,SELECT_READ,NULL); + defun(ctx,"READDIR",mod,DIRECTORY,NULL); #if !vxworks - defun(ctx,"GETHOSTNAME",mod,GETHOSTNAME); - defun(ctx,"GETHOSTBYNAME",mod,GETHOSTBYNAME); - defun(ctx,"GETHOSTBYADDR",mod,GETHOSTBYADDR); - defun(ctx,"GETNETBYNAME",mod,GETNETBYNAME); - defun(ctx,"GETPROTOBYNAME",mod,GETPROTOBYNAME); - defun(ctx,"GETSERVBYNAME",mod,GETSERVBYNAME); + defun(ctx,"GETHOSTNAME",mod,GETHOSTNAME,NULL); + defun(ctx,"GETHOSTBYNAME",mod,GETHOSTBYNAME,NULL); + defun(ctx,"GETHOSTBYADDR",mod,GETHOSTBYADDR,NULL); + defun(ctx,"GETNETBYNAME",mod,GETNETBYNAME,NULL); + defun(ctx,"GETPROTOBYNAME",mod,GETPROTOBYNAME,NULL); + defun(ctx,"GETSERVBYNAME",mod,GETSERVBYNAME,NULL); /* Append by I.Hara for IPC */ - defun(ctx,"HTONS",mod,H2NS); - defun(ctx,"NTOHS",mod,N2HS); + defun(ctx,"HTONS",mod,H2NS,NULL); + defun(ctx,"NTOHS",mod,N2HS,NULL); #endif #if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha - defun(ctx,"VFORK",mod,VFORK); + defun(ctx,"VFORK",mod,VFORK,NULL); #endif - defun(ctx,"EXEC",mod,EXEC); + defun(ctx,"EXEC",mod,EXEC,NULL); #if !Solaris2 - defun(ctx,"GETPRIORITY",mod,GETPRIORITY); - defun(ctx,"SETPRIORITY",mod,SETPRIORITY); + defun(ctx,"GETPRIORITY",mod,GETPRIORITY,NULL); + defun(ctx,"SETPRIORITY",mod,SETPRIORITY,NULL); #endif #if sun3 || sun4 || vax || mips || i386 || alpha - defun(ctx,"PUTENV",mod,PUTENV); + defun(ctx,"PUTENV",mod,PUTENV,NULL); #endif #if sun3 || sun4 && !Solaris2 || Linux || alpha - defun(ctx,"USLEEP",mod,USLEEP); + defun(ctx,"USLEEP",mod,USLEEP,NULL); #endif #if !news - defun(ctx,"MSGGET",mod,MSGGET); - defun(ctx,"MSGSND",mod,MSGSND); - defun(ctx,"MSGRCV",mod,MSGRCV); - defun(ctx,"MSGCTL",mod,MSGCTL); + defun(ctx,"MSGGET",mod,MSGGET,NULL); + defun(ctx,"MSGSND",mod,MSGSND,NULL); + defun(ctx,"MSGRCV",mod,MSGRCV,NULL); + defun(ctx,"MSGCTL",mod,MSGCTL,NULL); #endif #if sun3 || sun4 || news || alpha - defun(ctx,"VALLOC",mod,VALLOC); + defun(ctx,"VALLOC",mod,VALLOC,NULL); #endif #if sun3 || sun4 || news || alpha || Linux - defun(ctx,"MMAP",mod,MMAP); - defun(ctx,"MUNMAP",mod,MUNMAP); -/* defun(ctx,"VADVISE",mod,VADVISE); */ + defun(ctx,"MMAP",mod,MMAP,NULL); + defun(ctx,"MUNMAP",mod,MUNMAP,NULL); +/* defun(ctx,"VADVISE",mod,VADVISE,NULL); */ #endif #if system5 || Linux - defun(ctx,"UNAME",mod,UNAME); + defun(ctx,"UNAME",mod,UNAME,NULL); #endif #endif /*socket*/ @@ -2047,15 +2047,15 @@ pointer mod; /*ndbm libraries*/ #ifdef DBM #if sun3 || sun4 - defun(ctx,"DBM-OPEN",mod,DBM_OPEN); - defun(ctx,"DBM-CLOSE",mod,DBM_CLOSE); - defun(ctx,"DBM-FETCH",mod,DBM_FETCH); - defun(ctx,"DBM-STORE",mod,DBM_STORE); - defun(ctx,"DBM-DELETE",mod,DBM_DELETE); - defun(ctx,"DBM-FIRSTKEY",mod,DBM_FIRSTKEY); - defun(ctx,"DBM-NEXTKEY",mod,DBM_NEXTKEY); - defun(ctx,"DBM-ERROR",mod,DBM_ERROR); - defun(ctx,"DBM-CLEARERR",mod,DBM_CLEARERR); + defun(ctx,"DBM-OPEN",mod,DBM_OPEN,NULL); + defun(ctx,"DBM-CLOSE",mod,DBM_CLOSE,NULL); + defun(ctx,"DBM-FETCH",mod,DBM_FETCH,NULL); + defun(ctx,"DBM-STORE",mod,DBM_STORE,NULL); + defun(ctx,"DBM-DELETE",mod,DBM_DELETE,NULL); + defun(ctx,"DBM-FIRSTKEY",mod,DBM_FIRSTKEY,NULL); + defun(ctx,"DBM-NEXTKEY",mod,DBM_NEXTKEY,NULL); + defun(ctx,"DBM-ERROR",mod,DBM_ERROR,NULL); + defun(ctx,"DBM-CLEARERR",mod,DBM_CLEARERR,NULL); #endif #endif diff --git a/lisp/c/vectorarray.c b/lisp/c/vectorarray.c index 8b45869f6..aa52a5458 100644 --- a/lisp/c/vectorarray.c +++ b/lisp/c/vectorarray.c @@ -460,25 +460,25 @@ void vectorarray(ctx,mod) register context *ctx; pointer mod; { - defun(ctx,"AREF",mod,AREF); - defun(ctx,"ASET",mod,ASET); - defun(ctx,"VECTOR-POP",mod,VECTORPOP); - defun(ctx,"VECTOR-PUSH",mod,VECTORPUSH); - defun(ctx,"VECTOR-PUSH-EXTEND",mod,VECTOREXPUSH); - defun(ctx,"ARRAYP",mod,ARRAYP); - defun(ctx,"SVREF",mod,SVREF); - defun(ctx,"SVSET",mod,SVSET); - defun(ctx,"VECTOR",mod,MKVECTOR); - defun(ctx,"VECTORP",mod,VECTORP); - defun(ctx,"INTEGER-VECTOR",mod,MKINTVECTOR); - defun(ctx,"BIT",mod,BIT); - defun(ctx,"SBIT",mod,BIT); - defun(ctx,"SETBIT",mod,SETBIT); - defun(ctx,"BIT-AND",mod,BITAND); - defun(ctx,"BIT-IOR",mod,BITIOR); - defun(ctx,"BIT-XOR",mod,BITXOR); - defun(ctx,"BIT-EQV",mod,BITEQV); - defun(ctx,"BIT-NAND",mod,BITNAND); - defun(ctx,"BIT-NOR",mod,BITNOR); - defun(ctx,"BIT-NOT",mod,BITNOT); + defun(ctx,"AREF",mod,AREF,NULL); + defun(ctx,"ASET",mod,ASET,NULL); + defun(ctx,"VECTOR-POP",mod,VECTORPOP,NULL); + defun(ctx,"VECTOR-PUSH",mod,VECTORPUSH,NULL); + defun(ctx,"VECTOR-PUSH-EXTEND",mod,VECTOREXPUSH,NULL); + defun(ctx,"ARRAYP",mod,ARRAYP,NULL); + defun(ctx,"SVREF",mod,SVREF,NULL); + defun(ctx,"SVSET",mod,SVSET,NULL); + defun(ctx,"VECTOR",mod,MKVECTOR,NULL); + defun(ctx,"VECTORP",mod,VECTORP,NULL); + defun(ctx,"INTEGER-VECTOR",mod,MKINTVECTOR,NULL); + defun(ctx,"BIT",mod,BIT,NULL); + defun(ctx,"SBIT",mod,BIT,NULL); + defun(ctx,"SETBIT",mod,SETBIT,NULL); + defun(ctx,"BIT-AND",mod,BITAND,NULL); + defun(ctx,"BIT-IOR",mod,BITIOR,NULL); + defun(ctx,"BIT-XOR",mod,BITXOR,NULL); + defun(ctx,"BIT-EQV",mod,BITEQV,NULL); + defun(ctx,"BIT-NAND",mod,BITNAND,NULL); + defun(ctx,"BIT-NOR",mod,BITNOR,NULL); + defun(ctx,"BIT-NOT",mod,BITNOT,NULL); } diff --git a/lisp/geo/intersection.c b/lisp/geo/intersection.c index f6e379147..cf39beeac 100644 --- a/lisp/geo/intersection.c +++ b/lisp/geo/intersection.c @@ -291,12 +291,12 @@ pointer argv[]; printf("compfun=%x\n", compfun); */ - x=defun(ctx,"LINE-INTERSECTION",mod,LINEINTERSECTION); - defun(ctx,"LINE-INTERSECTION3",mod,LINEINTERSECTION3); + x=defun(ctx,"LINE-INTERSECTION",mod,LINEINTERSECTION,NULL); + defun(ctx,"LINE-INTERSECTION3",mod,LINEINTERSECTION3,NULL); /* clippers*/ - defun(ctx,"VIEWPORTCLIP",mod,VPCLIP); - defun(ctx,"HOMO-VIEWPORT-CLIP",mod,HOMO_VPCLIP); - defun(ctx,"HOMO2NORMAL",mod,HOMO2NORMAL); - defun(ctx,"HOMOGENIZE",mod,HOMOGENIZE); + defun(ctx,"VIEWPORTCLIP",mod,VPCLIP,NULL); + defun(ctx,"HOMO-VIEWPORT-CLIP",mod,HOMO_VPCLIP,NULL); + defun(ctx,"HOMO2NORMAL",mod,HOMO2NORMAL,NULL); + defun(ctx,"HOMOGENIZE",mod,HOMOGENIZE,NULL); return(T); } diff --git a/lisp/image/RGBHLS.c b/lisp/image/RGBHLS.c index 8d0b7877d..8e39b87dd 100644 --- a/lisp/image/RGBHLS.c +++ b/lisp/image/RGBHLS.c @@ -69,7 +69,7 @@ context *ctx; int n; pointer argv[]; { pointer mod=argv[0]; - defun(ctx,"RGB-TO-HLS", mod, RGB_TO_HLS); + defun(ctx,"RGB-TO-HLS", mod, RGB_TO_HLS,NULL); return(T); } diff --git a/lisp/image/convolve.c b/lisp/image/convolve.c index 90e388da2..b7935cd47 100644 --- a/lisp/image/convolve.c +++ b/lisp/image/convolve.c @@ -203,10 +203,10 @@ pointer argv[]; { pointer mod=argv[0]; /* printf("convolve is being initialized. mod=%x\n",mod); */ - defun(ctx,"CONVOLVE3",mod,CONVOLVE3); - defun(ctx,"LOOK-UP",mod,LOOK_UP); - defun(ctx,"HALVE-IMAGE",mod,HALVE_IMAGE); - defun(ctx,"DOUBLE-IMAGE",mod,DOUBLE_IMAGE); - defun(ctx,"MEDIAN-IMAGE",mod,MEDIAN_IMAGE); + defun(ctx,"CONVOLVE3",mod,CONVOLVE3,NULL); + defun(ctx,"LOOK-UP",mod,LOOK_UP,NULL); + defun(ctx,"HALVE-IMAGE",mod,HALVE_IMAGE,NULL); + defun(ctx,"DOUBLE-IMAGE",mod,DOUBLE_IMAGE,NULL); + defun(ctx,"MEDIAN-IMAGE",mod,MEDIAN_IMAGE,NULL); } diff --git a/lisp/image/image_correlation.c b/lisp/image/image_correlation.c index ce1027b13..a272d9155 100644 --- a/lisp/image/image_correlation.c +++ b/lisp/image/image_correlation.c @@ -196,8 +196,8 @@ context *ctx; int n; pointer argv[]; { pointer mod=argv[0]; - defun(ctx,"IMAGE-CORRELATION1",mod,IMAGE_CORRELATION1); - defun(ctx,"IMAGE-CORRELATION",mod,IMAGE_CORRELATION); - defun(ctx,"CIRCULAR-CORRELATION",mod,CIRCULAR_CORRELATION); + defun(ctx,"IMAGE-CORRELATION1",mod,IMAGE_CORRELATION1,NULL); + defun(ctx,"IMAGE-CORRELATION",mod,IMAGE_CORRELATION,NULL); + defun(ctx,"CIRCULAR-CORRELATION",mod,CIRCULAR_CORRELATION,NULL); return(NIL); } diff --git a/lisp/image/pixword.c b/lisp/image/pixword.c index 1d0d048e1..02c8f75a6 100644 --- a/lisp/image/pixword.c +++ b/lisp/image/pixword.c @@ -76,7 +76,7 @@ extern void pixword(ctx,n,argv) int n; pointer argv[]; { pointer mod=argv[0]; - defun(ctx,"SPLIT-RGB",mod,SPLIT_RGB); - defun(ctx,"MERGE-RGB",mod,MERGE_RGB); + defun(ctx,"SPLIT-RGB",mod,SPLIT_RGB,NULL); + defun(ctx,"MERGE-RGB",mod,MERGE_RGB,NULL); } diff --git a/lisp/opengl/src/eglfunc.c b/lisp/opengl/src/eglfunc.c index d0652c6f3..576382822 100644 --- a/lisp/opengl/src/eglfunc.c +++ b/lisp/opengl/src/eglfunc.c @@ -27,7 +27,7 @@ eglfunc(ctx, n, argv) int n; pointer argv[]; { - defun(ctx, "EGLGETSTRING", argv[0], EGLGETSTRING); + defun(ctx, "EGLGETSTRING", argv[0], EGLGETSTRING,NULL); } static init_object_module()