diff options
author | Andy Wingo <wingo@pobox.com> | 2018-06-26 11:40:22 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-06-26 11:40:22 +0200 |
commit | 5804c977d74e1ccbb3378004aa1ab00200a857a0 (patch) | |
tree | f94d92393297d95bfc08751fd84f8ba4e6d92266 /libguile/intrinsics.c | |
parent | 51e35158bad42b8db28e9272ebb279f17b76dbe4 (diff) | |
download | guile-5804c977d74e1ccbb3378004aa1ab00200a857a0.tar.gz |
Rename scm_i_thread to scm_thread
* libguile/scm.h (struct scm_thread, scm_thread): Rename from
scm_i_thread.
* libguile/deprecated.h (scm_i_thread): Add deprecated typedef.
* libguile/threads.h: Adapt to renaming.
* libguile/intrinsics.h:
* libguile/scmsigs.h:
* libguile/cache-internal.h: Remove threads.h includes; unnecessary with
the forward decl.
* libguile/continuations.h:
* libguile/gc-inline.h:
* libguile/async.h: Adapt scm_thread type name change.
* libguile/async.c:
* libguile/continuations.c:
* libguile/control.c:
* libguile/dynstack.c:
* libguile/dynwind.c:
* libguile/eval.c:
* libguile/finalizers.c:
* libguile/fluids.c:
* libguile/gc.c:
* libguile/intrinsics.c:
* libguile/load.c:
* libguile/memoize.c:
* libguile/print.c:
* libguile/read.c:
* libguile/scmsigs.c:
* libguile/script.c:
* libguile/stackchk.c:
* libguile/stacks.c:
* libguile/symbols.c:
* libguile/threads.c:
* libguile/throw.c:
* libguile/vm-engine.c:
* libguile/vm.c: Adapt to type name change, and add additional includes
as needed.
Diffstat (limited to 'libguile/intrinsics.c')
-rw-r--r-- | libguile/intrinsics.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c index 72c649311..4adb67b8c 100644 --- a/libguile/intrinsics.c +++ b/libguile/intrinsics.c @@ -32,6 +32,7 @@ #include "modules.h" #include "numbers.h" #include "symbols.h" +#include "threads.h" #include "intrinsics.h" @@ -109,32 +110,32 @@ logsub (SCM x, SCM y) } static void -wind (scm_i_thread *thread, SCM winder, SCM unwinder) +wind (scm_thread *thread, SCM winder, SCM unwinder) { scm_dynstack_push_dynwind (&thread->dynstack, winder, unwinder); } static void -unwind (scm_i_thread *thread) +unwind (scm_thread *thread) { scm_dynstack_pop (&thread->dynstack); } static void -push_fluid (scm_i_thread *thread, SCM fluid, SCM value) +push_fluid (scm_thread *thread, SCM fluid, SCM value) { scm_dynstack_push_fluid (&thread->dynstack, fluid, value, thread->dynamic_state); } static void -pop_fluid (scm_i_thread *thread) +pop_fluid (scm_thread *thread) { scm_dynstack_unwind_fluid (&thread->dynstack, thread->dynamic_state); } static SCM -fluid_ref (scm_i_thread *thread, SCM fluid) +fluid_ref (scm_thread *thread, SCM fluid) { struct scm_cache_entry *entry; @@ -148,7 +149,7 @@ fluid_ref (scm_i_thread *thread, SCM fluid) } static void -fluid_set_x (scm_i_thread *thread, SCM fluid, SCM value) +fluid_set_x (scm_thread *thread, SCM fluid, SCM value) { struct scm_cache_entry *entry; @@ -161,14 +162,14 @@ fluid_set_x (scm_i_thread *thread, SCM fluid, SCM value) } static void -push_dynamic_state (scm_i_thread *thread, SCM state) +push_dynamic_state (scm_thread *thread, SCM state) { scm_dynstack_push_dynamic_state (&thread->dynstack, state, thread->dynamic_state); } static void -pop_dynamic_state (scm_i_thread *thread) +pop_dynamic_state (scm_thread *thread) { scm_dynstack_unwind_dynamic_state (&thread->dynstack, thread->dynamic_state); |