summaryrefslogtreecommitdiff
path: root/libguile/continuations.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-26 11:40:22 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-26 11:40:22 +0200
commit5804c977d74e1ccbb3378004aa1ab00200a857a0 (patch)
treef94d92393297d95bfc08751fd84f8ba4e6d92266 /libguile/continuations.c
parent51e35158bad42b8db28e9272ebb279f17b76dbe4 (diff)
downloadguile-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/continuations.c')
-rw-r--r--libguile/continuations.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 172168e61..467ae4ea9 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -124,7 +124,7 @@ continuation_print (SCM obj, SCM port, scm_print_state *state SCM_UNUSED)
#endif
static void
-capture_auxiliary_stack (scm_i_thread *thread, scm_t_contregs *continuation)
+capture_auxiliary_stack (scm_thread *thread, scm_t_contregs *continuation)
{
#if SCM_HAVE_AUXILIARY_STACK
# if !(defined __ia64 or defined __ia64__)
@@ -158,7 +158,7 @@ capture_auxiliary_stack (scm_i_thread *thread, scm_t_contregs *continuation)
}
static void
-restore_auxiliary_stack (scm_i_thread *thread, scm_t_contregs *continuation)
+restore_auxiliary_stack (scm_thread *thread, scm_t_contregs *continuation)
{
#if SCM_HAVE_AUXILIARY_STACK
memcpy (thread->auxiliary_stack_base, continuation->auxiliary_stack,
@@ -167,7 +167,7 @@ restore_auxiliary_stack (scm_i_thread *thread, scm_t_contregs *continuation)
}
SCM
-scm_i_make_continuation (jmp_buf *registers, scm_i_thread *thread, SCM vm_cont)
+scm_i_make_continuation (jmp_buf *registers, scm_thread *thread, SCM vm_cont)
{
SCM cont;
scm_t_contregs *continuation;
@@ -277,7 +277,7 @@ copy_stack_and_call (scm_t_contregs *continuation,
{
scm_t_dynstack *dynstack;
scm_t_bits *joint;
- scm_i_thread *thread = SCM_I_CURRENT_THREAD;
+ scm_thread *thread = SCM_I_CURRENT_THREAD;
dynstack = SCM_VM_CONT_DATA (continuation->vm_cont)->dynstack;
@@ -299,7 +299,7 @@ copy_stack_and_call (scm_t_contregs *continuation,
static void
scm_dynthrow (SCM cont)
{
- scm_i_thread *thread = SCM_I_CURRENT_THREAD;
+ scm_thread *thread = SCM_I_CURRENT_THREAD;
scm_t_contregs *continuation = SCM_CONTREGS (cont);
SCM_STACKITEM *dst = thread->continuation_base;
SCM_STACKITEM stack_top_element;
@@ -333,7 +333,7 @@ scm_i_with_continuation_barrier (scm_t_catch_body body,
void *pre_unwind_handler_data)
{
SCM_STACKITEM stack_item;
- scm_i_thread *thread = SCM_I_CURRENT_THREAD;
+ scm_thread *thread = SCM_I_CURRENT_THREAD;
SCM old_controot;
SCM_STACKITEM *old_contbase;
SCM result;