fix header-file issues

This commit is contained in:
Matthew Flatt 2013-03-18 11:16:45 -07:00
parent 06696d67b4
commit 3bf9dd93dc
9 changed files with 100 additions and 62 deletions

View File

@ -106,6 +106,7 @@ EXPORTS
scheme_log scheme_log
scheme_log_w_data scheme_log_w_data
scheme_log_message scheme_log_message
scheme_log_name_message
scheme_log_abort scheme_log_abort
scheme_log_warning scheme_log_warning
scheme_glib_log_message scheme_glib_log_message

View File

@ -106,6 +106,7 @@ EXPORTS
scheme_log scheme_log
scheme_log_w_data scheme_log_w_data
scheme_log_message scheme_log_message
scheme_log_name_message
scheme_log_abort scheme_log_abort
scheme_log_warning scheme_log_warning
scheme_glib_log_message scheme_glib_log_message

View File

@ -104,6 +104,7 @@ scheme_log_level_p
scheme_log scheme_log
scheme_log_w_data scheme_log_w_data
scheme_log_message scheme_log_message
scheme_log_name_message
scheme_log_abort scheme_log_abort
scheme_log_warning scheme_log_warning
scheme_glib_log_message scheme_glib_log_message

View File

@ -104,6 +104,7 @@ scheme_log_level_p
scheme_log scheme_log
scheme_log_w_data scheme_log_w_data
scheme_log_message scheme_log_message
scheme_log_name_message
scheme_log_abort scheme_log_abort
scheme_log_warning scheme_log_warning
scheme_glib_log_message scheme_glib_log_message

View File

@ -294,8 +294,7 @@ SCONFIG = $(srcdir)/../sconfig.h $(srcdir)/../uconfig.h ../mzconfig.h
COMMON_HEADERS = $(srcdir)/schpriv.h $(srcdir)/schexn.h $(SCONFIG) $(srcdir)/../include/scheme.h \ COMMON_HEADERS = $(srcdir)/schpriv.h $(srcdir)/schexn.h $(SCONFIG) $(srcdir)/../include/scheme.h \
$(srcdir)/../include/schthread.h $(srcdir)/mzrt.h $(srcdir)/mzrt_cas.inc \ $(srcdir)/../include/schthread.h $(srcdir)/mzrt.h $(srcdir)/mzrt_cas.inc \
$(srcdir)/longdouble/longdouble.h $(srcdir)/longdouble/longdouble.h
JIT_HEADERS = $(srcdir)/../src/jit.h $(srcdir)/../src/jitfpu.h \ JIT_HEADERS = $(srcdir)/jit.h $(srcdir)/jitfpu.h $(srcdir)/stypes.h \
$(srcdir)/../src/stypes.h \
$(srcdir)/lightning/i386/core.h $(srcdir)/lightning/i386/core-common.h \ $(srcdir)/lightning/i386/core.h $(srcdir)/lightning/i386/core-common.h \
$(srcdir)/lightning/i386/asm.h $(srcdir)/lightning/i386/asm-common.h \ $(srcdir)/lightning/i386/asm.h $(srcdir)/lightning/i386/asm-common.h \
$(srcdir)/lightning/i386/funcs.h $(srcdir)/lightning/i386/funcs-common.h \ $(srcdir)/lightning/i386/funcs.h $(srcdir)/lightning/i386/funcs-common.h \
@ -310,40 +309,40 @@ JIT_HEADERS = $(srcdir)/../src/jit.h $(srcdir)/../src/jitfpu.h \
salloc.@LTO@: $(COMMON_HEADERS) \ salloc.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../gc/gc.h $(srcdir)/mzmark_salloc.inc $(srcdir)/../gc/gc.h $(srcdir)/mzmark_salloc.inc
bignum.@LTO@: $(COMMON_HEADERS) \ bignum.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
bool.@LTO@: $(COMMON_HEADERS) \ bool.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzeqchk.inc $(srcdir)/stypes.h $(srcdir)/mzeqchk.inc
builtin.@LTO@: $(COMMON_HEADERS) \ builtin.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schminc.h $(srcdir)/startup.inc $(srcdir)/cstartup.inc $(srcdir)/stypes.h $(srcdir)/schminc.h $(srcdir)/startup.inc $(srcdir)/cstartup.inc
char.@LTO@: $(COMMON_HEADERS) \ char.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schuchar.inc $(srcdir)/stypes.h $(srcdir)/schuchar.inc
compenv.@LTO@: $(COMMON_HEADERS) \ compenv.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_compenv.inc $(srcdir)/stypes.h $(srcdir)/mzmark_compenv.inc
compile.@LTO@: $(COMMON_HEADERS) \ compile.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_compile.inc $(srcdir)/stypes.h $(srcdir)/mzmark_compile.inc
complex.@LTO@: $(COMMON_HEADERS) \ complex.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
dynext.@LTO@: $(COMMON_HEADERS) \ dynext.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/../src/schemex.h \ $(srcdir)/stypes.h $(srcdir)/schemef.h \
$(srcdir)/schvers.h $(srcdir)/../gc/gc.h $(srcdir)/schemex.h $(srcdir)/schvers.h $(srcdir)/../gc/gc.h
env.@LTO@: $(COMMON_HEADERS) \ env.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schminc.h $(srcdir)/mzmark_env.inc $(srcdir)/stypes.h $(srcdir)/schminc.h $(srcdir)/mzmark_env.inc
error.@LTO@: $(COMMON_HEADERS) \ error.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
eval.@LTO@: $(COMMON_HEADERS) \ eval.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_eval.inc \ $(srcdir)/stypes.h $(srcdir)/mzmark_eval.inc \
$(srcdir)/schmach.h $(srcdir)/mzstkchk.h $(srcdir)/schrunst.h \ $(srcdir)/schmach.h $(srcdir)/mzstkchk.h $(srcdir)/schrunst.h \
$(srcdir)/future.h $(srcdir)/future.h
file.@LTO@: $(COMMON_HEADERS) \ file.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
fun.@LTO@: $(COMMON_HEADERS) \ fun.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_fun.inc $(srcdir)/schmap.inc \ $(srcdir)/stypes.h $(srcdir)/mzmark_fun.inc $(srcdir)/schmap.inc \
$(srcdir)/future.h $(srcdir)/future.h
future.@LTO@: $(COMMON_HEADERS) $(srcdir)/future.h $(SCONFIG) \ future.@LTO@: $(COMMON_HEADERS) $(srcdir)/future.h $(SCONFIG) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_future.inc \ $(srcdir)/stypes.h $(srcdir)/mzmark_future.inc \
$(srcdir)/jit_ts_future_glue.c $(srcdir)/jit_ts_runtime_glue.c $(srcdir)/jit_ts_protos.h $(srcdir)/jit_ts_future_glue.c $(srcdir)/jit_ts_runtime_glue.c $(srcdir)/jit_ts_protos.h
hash.@LTO@: $(COMMON_HEADERS) \ hash.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_hash.inc $(srcdir)/stypes.h $(srcdir)/mzmark_hash.inc
jit.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) $(srcdir)/mzmark_jit.inc jit.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) $(srcdir)/mzmark_jit.inc
jitalloc.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) jitalloc.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS)
jitarith.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) jitarith.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS)
@ -351,67 +350,67 @@ jitcall.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS)
jitcommon.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) jitcommon.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS)
jitinline.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) jitinline.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS)
jitprep.@LTO@: $(COMMON_HEADERS) \ jitprep.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
jitstack.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) $(srcdir)/codetab.inc jitstack.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) $(srcdir)/codetab.inc
jitstate.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) jitstate.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS)
list.@LTO@: $(COMMON_HEADERS) \ list.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
marshal.@LTO@: $(COMMON_HEADERS) \ marshal.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
module.@LTO@: $(COMMON_HEADERS) \ module.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/stypes.h $(srcdir)/schfd.h
mzrt.@LTO@: $(COMMON_HEADERS) mzrt.@LTO@: $(COMMON_HEADERS)
network.@LTO@: $(COMMON_HEADERS) \ network.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_network.inc $(srcdir)/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_network.inc
numarith.@LTO@: $(COMMON_HEADERS) \ numarith.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/nummacs.h $(srcdir)/stypes.h $(srcdir)/nummacs.h
number.@LTO@: $(COMMON_HEADERS) \ number.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/nummacs.h $(srcdir)/stypes.h $(srcdir)/nummacs.h
numcomp.@LTO@: $(COMMON_HEADERS) \ numcomp.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/nummacs.h $(srcdir)/stypes.h $(srcdir)/nummacs.h
numstr.@LTO@: $(COMMON_HEADERS) \ numstr.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/random.inc $(srcdir)/newrandom.inc $(srcdir)/stypes.h $(srcdir)/random.inc $(srcdir)/newrandom.inc
optimize.@LTO@: $(COMMON_HEADERS) \ optimize.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_optimize.inc $(srcdir)/stypes.h $(srcdir)/mzmark_optimize.inc
place.@LTO@: $(COMMON_HEADERS) \ place.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_place.inc $(srcdir)/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_place.inc
port.@LTO@: $(COMMON_HEADERS) \ port.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_port.inc $(srcdir)/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_port.inc
portfun.@LTO@: $(COMMON_HEADERS) $(srcdir)/schvers.h \ portfun.@LTO@: $(COMMON_HEADERS) $(srcdir)/schvers.h \
$(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_portfun.inc $(srcdir)/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_portfun.inc
print.@LTO@: $(COMMON_HEADERS) $(srcdir)/../src/stypes.h $(srcdir)/../src/schcpt.h \ print.@LTO@: $(COMMON_HEADERS) $(srcdir)/stypes.h $(srcdir)/schcpt.h \
$(srcdir)/schvers.h $(SCONFIG) $(srcdir)/mzmark_print.inc \ $(srcdir)/schvers.h $(SCONFIG) $(srcdir)/mzmark_print.inc \
$(srcdir)/print_vector.inc $(srcdir)/print_vector.inc
thread.@LTO@: $(COMMON_HEADERS) \ thread.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_thread.inc $(srcdir)/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_thread.inc
rational.@LTO@: $(COMMON_HEADERS) \ rational.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
read.@LTO@: $(COMMON_HEADERS) \ read.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/schcpt.h $(srcdir)/schvers.h $(srcdir)/schminc.h \ $(srcdir)/schcpt.h $(srcdir)/schvers.h $(srcdir)/schminc.h \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_read.inc \ $(srcdir)/stypes.h $(srcdir)/mzmark_read.inc \
$(srcdir)/read_vector.inc $(srcdir)/read_vector.inc
regexp.@LTO@: $(COMMON_HEADERS) \ regexp.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_regexp.inc $(srcdir)/schrx.h $(srcdir)/stypes.h $(srcdir)/mzmark_regexp.inc $(srcdir)/schrx.h
resolve.@LTO@: $(COMMON_HEADERS) \ resolve.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_resolve.inc $(srcdir)/stypes.h $(srcdir)/mzmark_resolve.inc
setjmpup.@LTO@: $(COMMON_HEADERS) \ setjmpup.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schmach.h $(srcdir)/stypes.h $(srcdir)/schmach.h
sfs.@LTO@: $(COMMON_HEADERS) \ sfs.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_sfs.inc $(srcdir)/stypes.h $(srcdir)/mzmark_sfs.inc
string.@LTO@: $(COMMON_HEADERS) \ string.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schvers.h $(srcdir)/mzmark_string.inc $(srcdir)/strops.inc \ $(srcdir)/stypes.h $(srcdir)/schvers.h $(srcdir)/mzmark_string.inc $(srcdir)/strops.inc \
$(srcdir)/schustr.inc $(srcdir)/schustr.inc
struct.@LTO@: $(COMMON_HEADERS) \ struct.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_struct.inc $(srcdir)/stypes.h $(srcdir)/mzmark_struct.inc
syntax.@LTO@: $(COMMON_HEADERS) \ syntax.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_syntax.inc $(srcdir)/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_syntax.inc
symbol.@LTO@: $(COMMON_HEADERS) \ symbol.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
sema.@LTO@: $(COMMON_HEADERS) \ sema.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_sema.inc $(srcdir)/stypes.h $(srcdir)/mzmark_sema.inc
type.@LTO@: $(COMMON_HEADERS) \ type.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_type.inc $(srcdir)/stypes.h $(srcdir)/mzmark_type.inc
vector.@LTO@: $(COMMON_HEADERS) \ vector.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/stypes.h
validate.@LTO@: $(COMMON_HEADERS) \ validate.@LTO@: $(COMMON_HEADERS) \
$(srcdir)/../src/stypes.h $(srcdir)/mzmark_validate.inc $(srcdir)/stypes.h $(srcdir)/mzmark_validate.inc

View File

@ -34,7 +34,7 @@
/*========================================================================*/ /*========================================================================*/
/* setjmpup (continuations) */ /* setjmpup (continuations) */
/*========================================================================*/ /*========================================================================*/
#include "longdouble/longdouble.h"
MZ_EXTERN void scheme_init_jmpup_buf(Scheme_Jumpup_Buf *b); MZ_EXTERN void scheme_init_jmpup_buf(Scheme_Jumpup_Buf *b);
MZ_EXTERN int scheme_setjmpup_relative(Scheme_Jumpup_Buf *b, void *base, MZ_EXTERN int scheme_setjmpup_relative(Scheme_Jumpup_Buf *b, void *base,
void * volatile start, struct Scheme_Cont *cont); void * volatile start, struct Scheme_Cont *cont);
@ -619,7 +619,7 @@ MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_long_halves(uintptr_t lo
MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_unsigned_long_halves(uintptr_t lowhalf, uintptr_t hihalf); MZ_EXTERN Scheme_Object *scheme_make_integer_value_from_unsigned_long_halves(uintptr_t lowhalf, uintptr_t hihalf);
MZ_EXTERN Scheme_Object *scheme_make_double(double d); MZ_EXTERN Scheme_Object *scheme_make_double(double d);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
MZ_EXTERN Scheme_Object *scheme_make_long_double(long_double d); MZ_EXTERN Scheme_Object *scheme_make_long_double(mz_long_double d);
#endif #endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
MZ_EXTERN Scheme_Object *scheme_make_float(float f) ; MZ_EXTERN Scheme_Object *scheme_make_float(float f) ;
@ -643,7 +643,7 @@ XFORM_NONGCING MZ_EXTERN int scheme_get_unsigned_long_long_val(Scheme_Object *o,
MZ_EXTERN double scheme_real_to_double(Scheme_Object *r); MZ_EXTERN double scheme_real_to_double(Scheme_Object *r);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
MZ_EXTERN long_double scheme_real_to_long_double(Scheme_Object *r); MZ_EXTERN mz_long_double scheme_real_to_long_double(Scheme_Object *r);
#endif #endif
MZ_EXTERN Scheme_Object *scheme_make_cptr(void *cptr, Scheme_Object *typetag); MZ_EXTERN Scheme_Object *scheme_make_cptr(void *cptr, Scheme_Object *typetag);
@ -707,8 +707,8 @@ MZ_EXTERN Scheme_Object *scheme_make_bignum_from_unsigned_long_long(umzlonglong
XFORM_NONGCING MZ_EXTERN double scheme_bignum_to_double(const Scheme_Object *n); XFORM_NONGCING MZ_EXTERN double scheme_bignum_to_double(const Scheme_Object *n);
MZ_EXTERN Scheme_Object *scheme_bignum_from_double(double d); MZ_EXTERN Scheme_Object *scheme_bignum_from_double(double d);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
XFORM_NONGCING MZ_EXTERN long_double scheme_bignum_to_long_double(const Scheme_Object *n); XFORM_NONGCING MZ_EXTERN mz_long_double scheme_bignum_to_long_double(const Scheme_Object *n);
MZ_EXTERN Scheme_Object *scheme_bignum_from_long_double(long_double d); MZ_EXTERN Scheme_Object *scheme_bignum_from_long_double(mz_long_double d);
#endif #endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
XFORM_NONGCING MZ_EXTERN float scheme_bignum_to_float(const Scheme_Object *n); XFORM_NONGCING MZ_EXTERN float scheme_bignum_to_float(const Scheme_Object *n);
@ -731,8 +731,8 @@ MZ_EXTERN Scheme_Object *scheme_make_rational(const Scheme_Object *r, const Sche
MZ_EXTERN double scheme_rational_to_double(const Scheme_Object *n); MZ_EXTERN double scheme_rational_to_double(const Scheme_Object *n);
MZ_EXTERN Scheme_Object *scheme_rational_from_double(double d); MZ_EXTERN Scheme_Object *scheme_rational_from_double(double d);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
MZ_EXTERN long_double scheme_rational_to_long_double(const Scheme_Object *n); MZ_EXTERN mz_long_double scheme_rational_to_long_double(const Scheme_Object *n);
MZ_EXTERN Scheme_Object *scheme_rational_from_long_double(long_double d); MZ_EXTERN Scheme_Object *scheme_rational_from_long_double(mz_long_double d);
#endif #endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
MZ_EXTERN float scheme_rational_to_float(const Scheme_Object *n); MZ_EXTERN float scheme_rational_to_float(const Scheme_Object *n);

View File

@ -16,7 +16,6 @@ typedef struct {
/*========================================================================*/ /*========================================================================*/
/* setjmpup (continuations) */ /* setjmpup (continuations) */
/*========================================================================*/ /*========================================================================*/
#include "longdouble/longdouble.h"
void (*scheme_init_jmpup_buf)(Scheme_Jumpup_Buf *b); void (*scheme_init_jmpup_buf)(Scheme_Jumpup_Buf *b);
int (*scheme_setjmpup_relative)(Scheme_Jumpup_Buf *b, void *base, int (*scheme_setjmpup_relative)(Scheme_Jumpup_Buf *b, void *base,
void * volatile start, struct Scheme_Cont *cont); void * volatile start, struct Scheme_Cont *cont);
@ -498,7 +497,7 @@ Scheme_Object *(*scheme_make_integer_value_from_long_halves)(uintptr_t lowhalf,
Scheme_Object *(*scheme_make_integer_value_from_unsigned_long_halves)(uintptr_t lowhalf, uintptr_t hihalf); Scheme_Object *(*scheme_make_integer_value_from_unsigned_long_halves)(uintptr_t lowhalf, uintptr_t hihalf);
Scheme_Object *(*scheme_make_double)(double d); Scheme_Object *(*scheme_make_double)(double d);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
Scheme_Object *(*scheme_make_long_double)(long_double d); Scheme_Object *(*scheme_make_long_double)(mz_long_double d);
#endif #endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
Scheme_Object *(*scheme_make_float)(float f) ; Scheme_Object *(*scheme_make_float)(float f) ;
@ -519,7 +518,7 @@ int (*scheme_get_long_long_val)(Scheme_Object *o, mzlonglong *v);
int (*scheme_get_unsigned_long_long_val)(Scheme_Object *o, umzlonglong *v); int (*scheme_get_unsigned_long_long_val)(Scheme_Object *o, umzlonglong *v);
double (*scheme_real_to_double)(Scheme_Object *r); double (*scheme_real_to_double)(Scheme_Object *r);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
long_double (*scheme_real_to_long_double)(Scheme_Object *r); mz_long_double (*scheme_real_to_long_double)(Scheme_Object *r);
#endif #endif
Scheme_Object *(*scheme_make_cptr)(void *cptr, Scheme_Object *typetag); Scheme_Object *(*scheme_make_cptr)(void *cptr, Scheme_Object *typetag);
Scheme_Object *(*scheme_make_offset_cptr)(void *cptr, intptr_t offset, Scheme_Object *typetag); Scheme_Object *(*scheme_make_offset_cptr)(void *cptr, intptr_t offset, Scheme_Object *typetag);
@ -572,8 +571,8 @@ Scheme_Object *(*scheme_make_bignum_from_unsigned_long_long)(umzlonglong v);
double (*scheme_bignum_to_double)(const Scheme_Object *n); double (*scheme_bignum_to_double)(const Scheme_Object *n);
Scheme_Object *(*scheme_bignum_from_double)(double d); Scheme_Object *(*scheme_bignum_from_double)(double d);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
long_double (*scheme_bignum_to_long_double)(const Scheme_Object *n); mz_long_double (*scheme_bignum_to_long_double)(const Scheme_Object *n);
Scheme_Object *(*scheme_bignum_from_long_double)(long_double d); Scheme_Object *(*scheme_bignum_from_long_double)(mz_long_double d);
#endif #endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
float (*scheme_bignum_to_float)(const Scheme_Object *n); float (*scheme_bignum_to_float)(const Scheme_Object *n);
@ -594,8 +593,8 @@ Scheme_Object *(*scheme_make_rational)(const Scheme_Object *r, const Scheme_Obje
double (*scheme_rational_to_double)(const Scheme_Object *n); double (*scheme_rational_to_double)(const Scheme_Object *n);
Scheme_Object *(*scheme_rational_from_double)(double d); Scheme_Object *(*scheme_rational_from_double)(double d);
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
long_double (*scheme_rational_to_long_double)(const Scheme_Object *n); mz_long_double (*scheme_rational_to_long_double)(const Scheme_Object *n);
Scheme_Object *(*scheme_rational_from_long_double)(long_double d); Scheme_Object *(*scheme_rational_from_long_double)(mz_long_double d);
#endif #endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
float (*scheme_rational_to_float)(const Scheme_Object *n); float (*scheme_rational_to_float)(const Scheme_Object *n);

View File

@ -112,6 +112,7 @@
scheme_extension_table->scheme_log = scheme_log; scheme_extension_table->scheme_log = scheme_log;
scheme_extension_table->scheme_log_w_data = scheme_log_w_data; scheme_extension_table->scheme_log_w_data = scheme_log_w_data;
scheme_extension_table->scheme_log_message = scheme_log_message; scheme_extension_table->scheme_log_message = scheme_log_message;
scheme_extension_table->scheme_log_name_message = scheme_log_name_message;
scheme_extension_table->scheme_log_abort = scheme_log_abort; scheme_extension_table->scheme_log_abort = scheme_log_abort;
scheme_extension_table->scheme_log_warning = scheme_log_warning; scheme_extension_table->scheme_log_warning = scheme_log_warning;
scheme_extension_table->scheme_glib_log_message = scheme_glib_log_message; scheme_extension_table->scheme_glib_log_message = scheme_glib_log_message;
@ -349,6 +350,9 @@
scheme_extension_table->scheme_string_recase = scheme_string_recase; scheme_extension_table->scheme_string_recase = scheme_string_recase;
scheme_extension_table->scheme_make_vector = scheme_make_vector; scheme_extension_table->scheme_make_vector = scheme_make_vector;
scheme_extension_table->scheme_alloc_flvector = scheme_alloc_flvector; scheme_extension_table->scheme_alloc_flvector = scheme_alloc_flvector;
#ifdef MZ_LONG_DOUBLE
scheme_extension_table->scheme_alloc_extflvector = scheme_alloc_extflvector;
#endif
scheme_extension_table->scheme_alloc_fxvector = scheme_alloc_fxvector; scheme_extension_table->scheme_alloc_fxvector = scheme_alloc_fxvector;
scheme_extension_table->scheme_make_integer_value = scheme_make_integer_value; scheme_extension_table->scheme_make_integer_value = scheme_make_integer_value;
scheme_extension_table->scheme_make_integer_value_from_unsigned = scheme_make_integer_value_from_unsigned; scheme_extension_table->scheme_make_integer_value_from_unsigned = scheme_make_integer_value_from_unsigned;
@ -357,6 +361,9 @@
scheme_extension_table->scheme_make_integer_value_from_long_halves = scheme_make_integer_value_from_long_halves; scheme_extension_table->scheme_make_integer_value_from_long_halves = scheme_make_integer_value_from_long_halves;
scheme_extension_table->scheme_make_integer_value_from_unsigned_long_halves = scheme_make_integer_value_from_unsigned_long_halves; scheme_extension_table->scheme_make_integer_value_from_unsigned_long_halves = scheme_make_integer_value_from_unsigned_long_halves;
scheme_extension_table->scheme_make_double = scheme_make_double; scheme_extension_table->scheme_make_double = scheme_make_double;
#ifdef MZ_LONG_DOUBLE
scheme_extension_table->scheme_make_long_double = scheme_make_long_double;
#endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
scheme_extension_table->scheme_make_float = scheme_make_float; scheme_extension_table->scheme_make_float = scheme_make_float;
#endif #endif
@ -375,6 +382,9 @@
scheme_extension_table->scheme_get_long_long_val = scheme_get_long_long_val; scheme_extension_table->scheme_get_long_long_val = scheme_get_long_long_val;
scheme_extension_table->scheme_get_unsigned_long_long_val = scheme_get_unsigned_long_long_val; scheme_extension_table->scheme_get_unsigned_long_long_val = scheme_get_unsigned_long_long_val;
scheme_extension_table->scheme_real_to_double = scheme_real_to_double; scheme_extension_table->scheme_real_to_double = scheme_real_to_double;
#ifdef MZ_LONG_DOUBLE
scheme_extension_table->scheme_real_to_long_double = scheme_real_to_long_double;
#endif
scheme_extension_table->scheme_make_cptr = scheme_make_cptr; scheme_extension_table->scheme_make_cptr = scheme_make_cptr;
scheme_extension_table->scheme_make_offset_cptr = scheme_make_offset_cptr; scheme_extension_table->scheme_make_offset_cptr = scheme_make_offset_cptr;
scheme_extension_table->scheme_make_external_cptr = scheme_make_external_cptr; scheme_extension_table->scheme_make_external_cptr = scheme_make_external_cptr;
@ -402,6 +412,10 @@
scheme_extension_table->scheme_make_bignum_from_unsigned_long_long = scheme_make_bignum_from_unsigned_long_long; scheme_extension_table->scheme_make_bignum_from_unsigned_long_long = scheme_make_bignum_from_unsigned_long_long;
scheme_extension_table->scheme_bignum_to_double = scheme_bignum_to_double; scheme_extension_table->scheme_bignum_to_double = scheme_bignum_to_double;
scheme_extension_table->scheme_bignum_from_double = scheme_bignum_from_double; scheme_extension_table->scheme_bignum_from_double = scheme_bignum_from_double;
#ifdef MZ_LONG_DOUBLE
scheme_extension_table->scheme_bignum_to_long_double = scheme_bignum_to_long_double;
scheme_extension_table->scheme_bignum_from_long_double = scheme_bignum_from_long_double;
#endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
scheme_extension_table->scheme_bignum_to_float = scheme_bignum_to_float; scheme_extension_table->scheme_bignum_to_float = scheme_bignum_to_float;
scheme_extension_table->scheme_bignum_from_float = scheme_bignum_from_float; scheme_extension_table->scheme_bignum_from_float = scheme_bignum_from_float;
@ -417,6 +431,10 @@
scheme_extension_table->scheme_make_rational = scheme_make_rational; scheme_extension_table->scheme_make_rational = scheme_make_rational;
scheme_extension_table->scheme_rational_to_double = scheme_rational_to_double; scheme_extension_table->scheme_rational_to_double = scheme_rational_to_double;
scheme_extension_table->scheme_rational_from_double = scheme_rational_from_double; scheme_extension_table->scheme_rational_from_double = scheme_rational_from_double;
#ifdef MZ_LONG_DOUBLE
scheme_extension_table->scheme_rational_to_long_double = scheme_rational_to_long_double;
scheme_extension_table->scheme_rational_from_long_double = scheme_rational_from_long_double;
#endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
scheme_extension_table->scheme_rational_to_float = scheme_rational_to_float; scheme_extension_table->scheme_rational_to_float = scheme_rational_to_float;
scheme_extension_table->scheme_rational_from_float = scheme_rational_from_float; scheme_extension_table->scheme_rational_from_float = scheme_rational_from_float;

View File

@ -112,6 +112,7 @@
#define scheme_log (scheme_extension_table->scheme_log) #define scheme_log (scheme_extension_table->scheme_log)
#define scheme_log_w_data (scheme_extension_table->scheme_log_w_data) #define scheme_log_w_data (scheme_extension_table->scheme_log_w_data)
#define scheme_log_message (scheme_extension_table->scheme_log_message) #define scheme_log_message (scheme_extension_table->scheme_log_message)
#define scheme_log_name_message (scheme_extension_table->scheme_log_name_message)
#define scheme_log_abort (scheme_extension_table->scheme_log_abort) #define scheme_log_abort (scheme_extension_table->scheme_log_abort)
#define scheme_log_warning (scheme_extension_table->scheme_log_warning) #define scheme_log_warning (scheme_extension_table->scheme_log_warning)
#define scheme_glib_log_message (scheme_extension_table->scheme_glib_log_message) #define scheme_glib_log_message (scheme_extension_table->scheme_glib_log_message)
@ -349,6 +350,9 @@
#define scheme_string_recase (scheme_extension_table->scheme_string_recase) #define scheme_string_recase (scheme_extension_table->scheme_string_recase)
#define scheme_make_vector (scheme_extension_table->scheme_make_vector) #define scheme_make_vector (scheme_extension_table->scheme_make_vector)
#define scheme_alloc_flvector (scheme_extension_table->scheme_alloc_flvector) #define scheme_alloc_flvector (scheme_extension_table->scheme_alloc_flvector)
#ifdef MZ_LONG_DOUBLE
#define scheme_alloc_extflvector (scheme_extension_table->scheme_alloc_extflvector)
#endif
#define scheme_alloc_fxvector (scheme_extension_table->scheme_alloc_fxvector) #define scheme_alloc_fxvector (scheme_extension_table->scheme_alloc_fxvector)
#define scheme_make_integer_value (scheme_extension_table->scheme_make_integer_value) #define scheme_make_integer_value (scheme_extension_table->scheme_make_integer_value)
#define scheme_make_integer_value_from_unsigned (scheme_extension_table->scheme_make_integer_value_from_unsigned) #define scheme_make_integer_value_from_unsigned (scheme_extension_table->scheme_make_integer_value_from_unsigned)
@ -357,6 +361,9 @@
#define scheme_make_integer_value_from_long_halves (scheme_extension_table->scheme_make_integer_value_from_long_halves) #define scheme_make_integer_value_from_long_halves (scheme_extension_table->scheme_make_integer_value_from_long_halves)
#define scheme_make_integer_value_from_unsigned_long_halves (scheme_extension_table->scheme_make_integer_value_from_unsigned_long_halves) #define scheme_make_integer_value_from_unsigned_long_halves (scheme_extension_table->scheme_make_integer_value_from_unsigned_long_halves)
#define scheme_make_double (scheme_extension_table->scheme_make_double) #define scheme_make_double (scheme_extension_table->scheme_make_double)
#ifdef MZ_LONG_DOUBLE
#define scheme_make_long_double (scheme_extension_table->scheme_make_long_double)
#endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
#define scheme_make_float (scheme_extension_table->scheme_make_float) #define scheme_make_float (scheme_extension_table->scheme_make_float)
#endif #endif
@ -375,6 +382,9 @@
#define scheme_get_long_long_val (scheme_extension_table->scheme_get_long_long_val) #define scheme_get_long_long_val (scheme_extension_table->scheme_get_long_long_val)
#define scheme_get_unsigned_long_long_val (scheme_extension_table->scheme_get_unsigned_long_long_val) #define scheme_get_unsigned_long_long_val (scheme_extension_table->scheme_get_unsigned_long_long_val)
#define scheme_real_to_double (scheme_extension_table->scheme_real_to_double) #define scheme_real_to_double (scheme_extension_table->scheme_real_to_double)
#ifdef MZ_LONG_DOUBLE
#define scheme_real_to_long_double (scheme_extension_table->scheme_real_to_long_double)
#endif
#define scheme_make_cptr (scheme_extension_table->scheme_make_cptr) #define scheme_make_cptr (scheme_extension_table->scheme_make_cptr)
#define scheme_make_offset_cptr (scheme_extension_table->scheme_make_offset_cptr) #define scheme_make_offset_cptr (scheme_extension_table->scheme_make_offset_cptr)
#define scheme_make_external_cptr (scheme_extension_table->scheme_make_external_cptr) #define scheme_make_external_cptr (scheme_extension_table->scheme_make_external_cptr)
@ -402,6 +412,10 @@
#define scheme_make_bignum_from_unsigned_long_long (scheme_extension_table->scheme_make_bignum_from_unsigned_long_long) #define scheme_make_bignum_from_unsigned_long_long (scheme_extension_table->scheme_make_bignum_from_unsigned_long_long)
#define scheme_bignum_to_double (scheme_extension_table->scheme_bignum_to_double) #define scheme_bignum_to_double (scheme_extension_table->scheme_bignum_to_double)
#define scheme_bignum_from_double (scheme_extension_table->scheme_bignum_from_double) #define scheme_bignum_from_double (scheme_extension_table->scheme_bignum_from_double)
#ifdef MZ_LONG_DOUBLE
#define scheme_bignum_to_long_double (scheme_extension_table->scheme_bignum_to_long_double)
#define scheme_bignum_from_long_double (scheme_extension_table->scheme_bignum_from_long_double)
#endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
#define scheme_bignum_to_float (scheme_extension_table->scheme_bignum_to_float) #define scheme_bignum_to_float (scheme_extension_table->scheme_bignum_to_float)
#define scheme_bignum_from_float (scheme_extension_table->scheme_bignum_from_float) #define scheme_bignum_from_float (scheme_extension_table->scheme_bignum_from_float)
@ -417,6 +431,10 @@
#define scheme_make_rational (scheme_extension_table->scheme_make_rational) #define scheme_make_rational (scheme_extension_table->scheme_make_rational)
#define scheme_rational_to_double (scheme_extension_table->scheme_rational_to_double) #define scheme_rational_to_double (scheme_extension_table->scheme_rational_to_double)
#define scheme_rational_from_double (scheme_extension_table->scheme_rational_from_double) #define scheme_rational_from_double (scheme_extension_table->scheme_rational_from_double)
#ifdef MZ_LONG_DOUBLE
#define scheme_rational_to_long_double (scheme_extension_table->scheme_rational_to_long_double)
#define scheme_rational_from_long_double (scheme_extension_table->scheme_rational_from_long_double)
#endif
#ifdef MZ_USE_SINGLE_FLOATS #ifdef MZ_USE_SINGLE_FLOATS
#define scheme_rational_to_float (scheme_extension_table->scheme_rational_to_float) #define scheme_rational_to_float (scheme_extension_table->scheme_rational_to_float)
#define scheme_rational_from_float (scheme_extension_table->scheme_rational_from_float) #define scheme_rational_from_float (scheme_extension_table->scheme_rational_from_float)