From 3bf9dd93dc7bbacdfa0a109e27046905e3d57be9 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 18 Mar 2013 11:16:45 -0700 Subject: [PATCH] fix header-file issues --- src/racket/include/mzwin.def | 1 + src/racket/include/mzwin3m.def | 1 + src/racket/include/racket.exp | 1 + src/racket/include/racket3m.exp | 1 + src/racket/src/Makefile.in | 95 ++++++++++++++++----------------- src/racket/src/schemef.h | 14 ++--- src/racket/src/schemex.h | 13 +++-- src/racket/src/schemex.inc | 18 +++++++ src/racket/src/schemexm.h | 18 +++++++ 9 files changed, 100 insertions(+), 62 deletions(-) diff --git a/src/racket/include/mzwin.def b/src/racket/include/mzwin.def index cb266a247e..246863aba7 100644 --- a/src/racket/include/mzwin.def +++ b/src/racket/include/mzwin.def @@ -106,6 +106,7 @@ EXPORTS scheme_log scheme_log_w_data scheme_log_message + scheme_log_name_message scheme_log_abort scheme_log_warning scheme_glib_log_message diff --git a/src/racket/include/mzwin3m.def b/src/racket/include/mzwin3m.def index d91c8da937..f02f978382 100644 --- a/src/racket/include/mzwin3m.def +++ b/src/racket/include/mzwin3m.def @@ -106,6 +106,7 @@ EXPORTS scheme_log scheme_log_w_data scheme_log_message + scheme_log_name_message scheme_log_abort scheme_log_warning scheme_glib_log_message diff --git a/src/racket/include/racket.exp b/src/racket/include/racket.exp index 5afc5c6a5e..d18d90800d 100644 --- a/src/racket/include/racket.exp +++ b/src/racket/include/racket.exp @@ -104,6 +104,7 @@ scheme_log_level_p scheme_log scheme_log_w_data scheme_log_message +scheme_log_name_message scheme_log_abort scheme_log_warning scheme_glib_log_message diff --git a/src/racket/include/racket3m.exp b/src/racket/include/racket3m.exp index 3a5be64751..95412d5de5 100644 --- a/src/racket/include/racket3m.exp +++ b/src/racket/include/racket3m.exp @@ -104,6 +104,7 @@ scheme_log_level_p scheme_log scheme_log_w_data scheme_log_message +scheme_log_name_message scheme_log_abort scheme_log_warning scheme_glib_log_message diff --git a/src/racket/src/Makefile.in b/src/racket/src/Makefile.in index 5a3d11bf0a..c30ff3b13c 100644 --- a/src/racket/src/Makefile.in +++ b/src/racket/src/Makefile.in @@ -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 \ $(srcdir)/../include/schthread.h $(srcdir)/mzrt.h $(srcdir)/mzrt_cas.inc \ $(srcdir)/longdouble/longdouble.h -JIT_HEADERS = $(srcdir)/../src/jit.h $(srcdir)/../src/jitfpu.h \ - $(srcdir)/../src/stypes.h \ +JIT_HEADERS = $(srcdir)/jit.h $(srcdir)/jitfpu.h $(srcdir)/stypes.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/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) \ $(srcdir)/../gc/gc.h $(srcdir)/mzmark_salloc.inc bignum.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h bool.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzeqchk.inc + $(srcdir)/stypes.h $(srcdir)/mzeqchk.inc 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) \ - $(srcdir)/../src/stypes.h $(srcdir)/schuchar.inc + $(srcdir)/stypes.h $(srcdir)/schuchar.inc compenv.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_compenv.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_compenv.inc compile.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_compile.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_compile.inc complex.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h dynext.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/../src/schemex.h \ - $(srcdir)/schvers.h $(srcdir)/../gc/gc.h $(srcdir)/schemex.h + $(srcdir)/stypes.h $(srcdir)/schemef.h \ + $(srcdir)/schvers.h $(srcdir)/../gc/gc.h 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) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h 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)/future.h file.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h 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 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 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 jitalloc.@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) jitinline.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) jitprep.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h jitstack.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) $(srcdir)/codetab.inc jitstate.@LTO@: $(COMMON_HEADERS) $(JIT_HEADERS) list.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h marshal.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h module.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/schfd.h + $(srcdir)/stypes.h $(srcdir)/schfd.h mzrt.@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) \ - $(srcdir)/../src/stypes.h $(srcdir)/nummacs.h + $(srcdir)/stypes.h $(srcdir)/nummacs.h number.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/nummacs.h + $(srcdir)/stypes.h $(srcdir)/nummacs.h numcomp.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/nummacs.h + $(srcdir)/stypes.h $(srcdir)/nummacs.h 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) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_optimize.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_optimize.inc 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) \ - $(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 \ - $(srcdir)/../src/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_portfun.inc -print.@LTO@: $(COMMON_HEADERS) $(srcdir)/../src/stypes.h $(srcdir)/../src/schcpt.h \ + $(srcdir)/stypes.h $(srcdir)/schfd.h $(srcdir)/mzmark_portfun.inc +print.@LTO@: $(COMMON_HEADERS) $(srcdir)/stypes.h $(srcdir)/schcpt.h \ $(srcdir)/schvers.h $(SCONFIG) $(srcdir)/mzmark_print.inc \ $(srcdir)/print_vector.inc 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) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h read.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/schcpt.h $(srcdir)/schvers.h $(srcdir)/schminc.h \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_read.inc \ + $(srcdir)/schcpt.h $(srcdir)/schvers.h $(srcdir)/schminc.h \ + $(srcdir)/stypes.h $(srcdir)/mzmark_read.inc \ $(srcdir)/read_vector.inc 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) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_resolve.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_resolve.inc setjmpup.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/schmach.h + $(srcdir)/stypes.h $(srcdir)/schmach.h sfs.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_sfs.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_sfs.inc 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 struct.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_struct.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_struct.inc 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) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h sema.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_sema.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_sema.inc type.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_type.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_type.inc vector.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h + $(srcdir)/stypes.h validate.@LTO@: $(COMMON_HEADERS) \ - $(srcdir)/../src/stypes.h $(srcdir)/mzmark_validate.inc + $(srcdir)/stypes.h $(srcdir)/mzmark_validate.inc diff --git a/src/racket/src/schemef.h b/src/racket/src/schemef.h index 01f533f7e4..f0ad804030 100644 --- a/src/racket/src/schemef.h +++ b/src/racket/src/schemef.h @@ -34,7 +34,7 @@ /*========================================================================*/ /* setjmpup (continuations) */ /*========================================================================*/ -#include "longdouble/longdouble.h" + MZ_EXTERN void scheme_init_jmpup_buf(Scheme_Jumpup_Buf *b); MZ_EXTERN int scheme_setjmpup_relative(Scheme_Jumpup_Buf *b, void *base, 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_double(double d); #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 #ifdef MZ_USE_SINGLE_FLOATS 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); #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 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); MZ_EXTERN Scheme_Object *scheme_bignum_from_double(double d); #ifdef MZ_LONG_DOUBLE -XFORM_NONGCING MZ_EXTERN long_double scheme_bignum_to_long_double(const Scheme_Object *n); -MZ_EXTERN Scheme_Object *scheme_bignum_from_long_double(long_double d); +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(mz_long_double d); #endif #ifdef MZ_USE_SINGLE_FLOATS 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 Scheme_Object *scheme_rational_from_double(double d); #ifdef MZ_LONG_DOUBLE -MZ_EXTERN 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 mz_long_double scheme_rational_to_long_double(const Scheme_Object *n); +MZ_EXTERN Scheme_Object *scheme_rational_from_long_double(mz_long_double d); #endif #ifdef MZ_USE_SINGLE_FLOATS MZ_EXTERN float scheme_rational_to_float(const Scheme_Object *n); diff --git a/src/racket/src/schemex.h b/src/racket/src/schemex.h index 30428b8658..ba67b539b3 100644 --- a/src/racket/src/schemex.h +++ b/src/racket/src/schemex.h @@ -16,7 +16,6 @@ typedef struct { /*========================================================================*/ /* setjmpup (continuations) */ /*========================================================================*/ -#include "longdouble/longdouble.h" void (*scheme_init_jmpup_buf)(Scheme_Jumpup_Buf *b); int (*scheme_setjmpup_relative)(Scheme_Jumpup_Buf *b, void *base, 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_double)(double d); #ifdef MZ_LONG_DOUBLE -Scheme_Object *(*scheme_make_long_double)(long_double d); +Scheme_Object *(*scheme_make_long_double)(mz_long_double d); #endif #ifdef MZ_USE_SINGLE_FLOATS 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); double (*scheme_real_to_double)(Scheme_Object *r); #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 Scheme_Object *(*scheme_make_cptr)(void *cptr, 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); Scheme_Object *(*scheme_bignum_from_double)(double d); #ifdef MZ_LONG_DOUBLE -long_double (*scheme_bignum_to_long_double)(const Scheme_Object *n); -Scheme_Object *(*scheme_bignum_from_long_double)(long_double d); +mz_long_double (*scheme_bignum_to_long_double)(const Scheme_Object *n); +Scheme_Object *(*scheme_bignum_from_long_double)(mz_long_double d); #endif #ifdef MZ_USE_SINGLE_FLOATS 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); Scheme_Object *(*scheme_rational_from_double)(double d); #ifdef MZ_LONG_DOUBLE -long_double (*scheme_rational_to_long_double)(const Scheme_Object *n); -Scheme_Object *(*scheme_rational_from_long_double)(long_double d); +mz_long_double (*scheme_rational_to_long_double)(const Scheme_Object *n); +Scheme_Object *(*scheme_rational_from_long_double)(mz_long_double d); #endif #ifdef MZ_USE_SINGLE_FLOATS float (*scheme_rational_to_float)(const Scheme_Object *n); diff --git a/src/racket/src/schemex.inc b/src/racket/src/schemex.inc index 715e75e96c..ae1769ab64 100644 --- a/src/racket/src/schemex.inc +++ b/src/racket/src/schemex.inc @@ -112,6 +112,7 @@ scheme_extension_table->scheme_log = scheme_log; 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_name_message = scheme_log_name_message; scheme_extension_table->scheme_log_abort = scheme_log_abort; scheme_extension_table->scheme_log_warning = scheme_log_warning; 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_make_vector = scheme_make_vector; 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_make_integer_value = scheme_make_integer_value; 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_unsigned_long_halves = scheme_make_integer_value_from_unsigned_long_halves; 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 scheme_extension_table->scheme_make_float = scheme_make_float; #endif @@ -375,6 +382,9 @@ 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_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_offset_cptr = scheme_make_offset_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_bignum_to_double = scheme_bignum_to_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 scheme_extension_table->scheme_bignum_to_float = scheme_bignum_to_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_rational_to_double = scheme_rational_to_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 scheme_extension_table->scheme_rational_to_float = scheme_rational_to_float; scheme_extension_table->scheme_rational_from_float = scheme_rational_from_float; diff --git a/src/racket/src/schemexm.h b/src/racket/src/schemexm.h index 5bdc858f34..17c64710e6 100644 --- a/src/racket/src/schemexm.h +++ b/src/racket/src/schemexm.h @@ -112,6 +112,7 @@ #define scheme_log (scheme_extension_table->scheme_log) #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_name_message (scheme_extension_table->scheme_log_name_message) #define scheme_log_abort (scheme_extension_table->scheme_log_abort) #define scheme_log_warning (scheme_extension_table->scheme_log_warning) #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_make_vector (scheme_extension_table->scheme_make_vector) #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_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) @@ -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_unsigned_long_halves (scheme_extension_table->scheme_make_integer_value_from_unsigned_long_halves) #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 #define scheme_make_float (scheme_extension_table->scheme_make_float) #endif @@ -375,6 +382,9 @@ #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_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_offset_cptr (scheme_extension_table->scheme_make_offset_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_bignum_to_double (scheme_extension_table->scheme_bignum_to_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 #define scheme_bignum_to_float (scheme_extension_table->scheme_bignum_to_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_rational_to_double (scheme_extension_table->scheme_rational_to_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 #define scheme_rational_to_float (scheme_extension_table->scheme_rational_to_float) #define scheme_rational_from_float (scheme_extension_table->scheme_rational_from_float)