gcl.git - GNU Common Lisp

diff --git a/gcl/lsp/destructuring_bind.c b/gcl/lsp/destructuring_bind.c
index 2cefe489d..88a728c53 100644
--- a/gcl/lsp/destructuring_bind.c
+++ b/gcl/lsp/destructuring_bind.c

@@ -1365,16 +1365,16 @@ T576:;

vs_top=(vs_base=base+6)+1;

return;}}

}

-static void LnkT95(){ call_or_link(VV[95],(void **)&Lnk95);} /* PARSE-DEFMACRO */

-static void LnkT94(){ call_or_link(VV[94],(void **)&Lnk94);} /* MAKE-KEYWORD */

-static void LnkT93(){ call_or_link(VV[93],(void **)&Lnk93);} /* PUSH-OPTIONAL-BINDING */

-static void LnkT92(){ call_or_link(VV[92],(void **)&Lnk92);} /* PUSH-SUB-LIST-BINDING */

-static void LnkT91(){ call_or_link(VV[91],(void **)&Lnk91);} /* DEFMACRO-ERROR */

-static void LnkT90(){ call_or_link(VV[90],(void **)&Lnk90);} /* PUSH-LET-BINDING */

-static void LnkT49(){ call_or_link(VV[49],(void **)&Lnk49);} /* LOOKUP-KEYWORD */

-static void LnkT89(){ call_or_link(VV[89],(void **)&Lnk89);} /* SPECIFIC-ERROR */

-static void LnkT88(){ call_or_link(VV[88],(void **)&Lnk88);} /* PARSE-DEFMACRO-LAMBDA-LIST */

-static void LnkT30(){ call_or_link(VV[30],(void **)&Lnk30);} /* PARSE-BODY */

+static void LnkT95(){ call_or_link(VV[95],(void **)(void *)&Lnk95);} /* PARSE-DEFMACRO */

+static void LnkT94(){ call_or_link(VV[94],(void **)(void *)&Lnk94);} /* MAKE-KEYWORD */

+static void LnkT93(){ call_or_link(VV[93],(void **)(void *)&Lnk93);} /* PUSH-OPTIONAL-BINDING */

+static void LnkT92(){ call_or_link(VV[92],(void **)(void *)&Lnk92);} /* PUSH-SUB-LIST-BINDING */

+static void LnkT91(){ call_or_link(VV[91],(void **)(void *)&Lnk91);} /* DEFMACRO-ERROR */

+static void LnkT90(){ call_or_link(VV[90],(void **)(void *)&Lnk90);} /* PUSH-LET-BINDING */

+static void LnkT49(){ call_or_link(VV[49],(void **)(void *)&Lnk49);} /* LOOKUP-KEYWORD */

+static void LnkT89(){ call_or_link(VV[89],(void **)(void *)&Lnk89);} /* SPECIFIC-ERROR */

+static void LnkT88(){ call_or_link(VV[88],(void **)(void *)&Lnk88);} /* PARSE-DEFMACRO-LAMBDA-LIST */

+static void LnkT30(){ call_or_link(VV[30],(void **)(void *)&Lnk30);} /* PARSE-BODY */

#ifdef SYSTEM_SPECIAL_INIT

SYSTEM_SPECIAL_INIT

diff --git a/gcl/o/error.c b/gcl/o/error.c
index d22ebcf6a..aaba0ccdf 100755
--- a/gcl/o/error.c
+++ b/gcl/o/error.c

@@ -120,7 +120,7 @@ ihs_top_function_name(ihs_ptr h)

-static object

+object

Icall_error_handler(object error_name,object error_format_string,int nfmt_args,...)

{ object b[20];

b[0]= error_name;

@@ -238,6 +238,7 @@ DEFUNO_NEW("CERROR",object,fLcerror,LISP

b[3]=null_string;

b[4]=fmt_string;

i=4;

+ n--;

va_start(ap,fmt_string);

while (--n)

b[++i]=va_arg(ap,object);