From f0b5a9e6c60c580214c08f1819344379d5f647de Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 19 Nov 2009 22:06:54 +0000 Subject: [PATCH] fix non-futures build svn: r16901 --- src/mzscheme/src/jit.c | 4 ++-- src/mzscheme/src/jit_ts.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mzscheme/src/jit.c b/src/mzscheme/src/jit.c index c5fb9152e4..2acb3962ce 100644 --- a/src/mzscheme/src/jit.c +++ b/src/mzscheme/src/jit.c @@ -2150,6 +2150,8 @@ static jit_insn *generate_proc_struct_retry(mz_jit_state *jitter, int num_rands, extern int g_print_prims; #endif +#include "jit_ts.c" + /* Support for intercepting direct calls to primitives: */ #ifdef FUTURES_ENABLED # define mz_prepare_direct_prim(n) mz_prepare(n) @@ -2184,8 +2186,6 @@ static Scheme_Object *prim_indirect(Scheme_Primitive_Closure_Proc proc, int argc be invoked directly from JIT code and are not considered thread-safe (are not invoked via apply_multi_from_native, etc.) */ -#include "jit_ts.c" - static void ts_on_demand(void) { START_XFORM_SKIP; diff --git a/src/mzscheme/src/jit_ts.c b/src/mzscheme/src/jit_ts.c index 75ce340f12..e7c08b5c8b 100644 --- a/src/mzscheme/src/jit_ts.c +++ b/src/mzscheme/src/jit_ts.c @@ -75,6 +75,9 @@ define_ts_S_s(apply_checked_fail) define_ts_iSi_s(scheme_build_list_offset) define_ts_siS_v(wrong_argument_count) #else +# define ts__scheme_apply_multi_from_native _scheme_apply_multi_from_native +# define ts__scheme_apply_from_native _scheme_apply_from_native +# define ts__scheme_tail_apply_from_native _scheme_tail_apply_from_native # define ts__scheme_tail_apply_from_native_fixup_args _scheme_tail_apply_from_native_fixup_args # define ts_scheme_force_value_same_mark scheme_force_value_same_mark # define ts_scheme_force_one_value_same_mark scheme_force_one_value_same_mark