From a61cebb1e9f03d6c460706b18c32e4219ad4901e Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Wed, 27 Feb 2013 09:04:56 +0900 Subject: [PATCH] Thread parameters are still needed when threads are disabled. --- eval.c | 2 +- include/chibi/eval.h | 2 +- opcodes.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eval.c b/eval.c index da384da2..76111ea0 100644 --- a/eval.c +++ b/eval.c @@ -1969,6 +1969,7 @@ sexp sexp_dk (sexp ctx, sexp self, sexp_sint_t n, sexp val) { return SEXP_VOID; } } +#endif sexp sexp_thread_parameters (sexp ctx, sexp self, sexp_sint_t n) { sexp res = sexp_context_params(ctx); @@ -1979,7 +1980,6 @@ sexp sexp_thread_parameters_set (sexp ctx, sexp self, sexp_sint_t n, sexp new) { sexp_context_params(ctx) = new; return SEXP_VOID; } -#endif void sexp_set_parameter (sexp ctx, sexp env, sexp name, sexp value) { sexp param = sexp_env_ref(env, name, SEXP_FALSE); diff --git a/include/chibi/eval.h b/include/chibi/eval.h index 9c0c6da1..59345d35 100644 --- a/include/chibi/eval.h +++ b/include/chibi/eval.h @@ -129,9 +129,9 @@ SEXP_API sexp sexp_string_utf8_index_set (sexp ctx, sexp self, sexp_sint_t n, se #endif #if SEXP_USE_GREEN_THREADS SEXP_API sexp sexp_dk (sexp ctx, sexp self, sexp_sint_t n, sexp val); +#endif SEXP_API sexp sexp_thread_parameters (sexp ctx, sexp self, sexp_sint_t n); SEXP_API sexp sexp_thread_parameters_set (sexp ctx, sexp self, sexp_sint_t n, sexp val); -#endif SEXP_API sexp sexp_string_cmp_op (sexp ctx, sexp self, sexp_sint_t n, sexp a, sexp b, sexp ci); #if SEXP_USE_RATIOS SEXP_API sexp sexp_ratio_numerator_op (sexp ctx, sexp self, sexp_sint_t n, sexp rat); diff --git a/opcodes.c b/opcodes.c index 8cd9c762..f333eaa7 100644 --- a/opcodes.c +++ b/opcodes.c @@ -248,10 +248,10 @@ _FN2(SEXP_VOID, _I(SEXP_STRING), _I(SEXP_BOOLEAN), "add-module-directory", 0, se #endif #if SEXP_USE_GREEN_THREADS _FN1OPT(_I(SEXP_OBJECT), _I(SEXP_OBJECT), "%dk", SEXP_FALSE, sexp_dk), -_FN0(_I(SEXP_OBJECT), "thread-parameters", 0, sexp_thread_parameters), -_FN1(_I(SEXP_OBJECT), _I(SEXP_OBJECT), "thread-parameters-set!", 0, sexp_thread_parameters_set), _OP(SEXP_OPC_GENERIC, SEXP_OP_YIELD, 0, 0, SEXP_VOID, SEXP_FALSE, SEXP_FALSE, SEXP_FALSE, 0, "yield!", 0, NULL), #endif +_FN0(_I(SEXP_OBJECT), "thread-parameters", 0, sexp_thread_parameters), +_FN1(_I(SEXP_OBJECT), _I(SEXP_OBJECT), "thread-parameters-set!", 0, sexp_thread_parameters_set), #if SEXP_USE_PROFILE_VM _FN0(SEXP_VOID, "reset-vm-profile", 0, sexp_reset_vm_profile), _FN0(SEXP_VOID, "print-vm-profile", 0, sexp_print_vm_profile),