| author | Camm Maguire <camm@debian.org> | 2003年07月16日 02:02:55 +0000 |
|---|---|---|
| committer | Camm Maguire <camm@debian.org> | 2003年07月16日 02:02:55 +0000 |
| commit | cc5ea4e49316df204d7b2ad7c65cf56cbd2b81c2 (patch) | |
| tree | 05414f2421455e0da205b0f1bdb9a42a6bec36bd | |
| parent | 5062083c9c9e5051cada5cab6a053b53268368e3 (diff) | |
| download | gcl-unlabeled-1.18.4.tar.gz | |
| -rwxr-xr-x | gcl/h/object.h | 6 | ||||
| -rwxr-xr-x | gcl/lsp/packlib.c | 16 |
diff --git a/gcl/h/object.h b/gcl/h/object.h index bd2bc42a2..751f41b00 100755 --- a/gcl/h/object.h +++ b/gcl/h/object.h @@ -360,8 +360,8 @@ struct ustring { }; -#define USHORT(x,i) (((unsigned short *)(x)->ust.ust_self)[i]) -#define SHORT(x,i) ((( short *)(x)->ust.ust_self)[i]) +#define USHORT_GCL(x,i) (((unsigned short *)(x)->ust.ust_self)[i]) +#define SHORT_GCL(x,i) ((( short *)(x)->ust.ust_self)[i]) #define BV_OFFSET(x) ((type_of(x)==t_bitvector ? x->bv.bv_offset : \ type_of(x)== t_array ? x->a.a_offset : (abort(),0))) @@ -455,7 +455,7 @@ struct s_data {object name; #define S_DATA(x) ((struct s_data *)((x)->str.str_self)) #define SLOT_TYPE(def,i) (((S_DATA(def))->raw->ust.ust_self[i])) -#define SLOT_POS(def,i) USHORT(S_DATA(def)->slot_position,i) +#define SLOT_POS(def,i) USHORT_GCL(S_DATA(def)->slot_position,i) #define STREF(type,x,i) (*((type *)(((char *)((x)->str.str_self))+(i)))) diff --git a/gcl/lsp/packlib.c b/gcl/lsp/packlib.c index 303ac1b55..dd9aeb097 100755 --- a/gcl/lsp/packlib.c +++ b/gcl/lsp/packlib.c @@ -1057,14 +1057,14 @@ T355:; vs_top=(vs_base=base+6)+1; return;} } -static void LnkT68(){ call_or_link(VV[68],(void **)&Lnk68);} /* SPECIFIC-ERROR */ -static object LnkTLI67(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[67],(void **)&LnkLI67,1,first,ap);va_end(ap);return V1;} /* PRINT-SYMBOL-APROPOS */ -static object LnkTLI66(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[66],(void **)&LnkLI66,first,ap);va_end(ap);return V1;} /* APROPOS-LIST */ -static void LnkT65(){ call_or_link(VV[65],(void **)&Lnk65);} /* STABLE-SORT */ -static object LnkTLI63(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[63],(void **)&LnkLI63,first,ap);va_end(ap);return V1;} /* DELETE-DUPLICATES */ -static object LnkTLI62(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[62],(void **)&LnkLI62,2,first,ap);va_end(ap);return V1;} /* SUBSTRINGP */ -static void LnkT15(){ call_or_link(VV[15],(void **)&Lnk15);} /* PACKAGE-SIZE */ -static void LnkT61(){ call_or_link(VV[61],(void **)&Lnk61);} /* FIND-DECLARATIONS */ +static void LnkT68(){ call_or_link(VV[68],(void **)(void *)&Lnk68);} /* SPECIFIC-ERROR */ +static object LnkTLI67(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[67],(void **)(void *)&LnkLI67,1,first,ap);va_end(ap);return V1;} /* PRINT-SYMBOL-APROPOS */ +static object LnkTLI66(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[66],(void **)(void *)&LnkLI66,first,ap);va_end(ap);return V1;} /* APROPOS-LIST */ +static void LnkT65(){ call_or_link(VV[65],(void **)(void *)&Lnk65);} /* STABLE-SORT */ +static object LnkTLI63(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[63],(void **)(void *)&LnkLI63,first,ap);va_end(ap);return V1;} /* DELETE-DUPLICATES */ +static object LnkTLI62(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[62],(void **)(void *)&LnkLI62,2,first,ap);va_end(ap);return V1;} /* SUBSTRINGP */ +static void LnkT15(){ call_or_link(VV[15],(void **)(void *)&Lnk15);} /* PACKAGE-SIZE */ +static void LnkT61(){ call_or_link(VV[61],(void **)(void *)&Lnk61);} /* FIND-DECLARATIONS */ #ifdef SYSTEM_SPECIAL_INIT SYSTEM_SPECIAL_INIT |