From 5804c977d74e1ccbb3378004aa1ab00200a857a0 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 26 Jun 2018 11:40:22 +0200 Subject: 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. --- libguile/fluids.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libguile/fluids.c') diff --git a/libguile/fluids.c b/libguile/fluids.c index df0fd7430..db14f17a8 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -37,6 +37,7 @@ #include "pairs.h" #include "ports.h" #include "print.h" +#include "threads.h" #include "variable.h" #include "weak-table.h" @@ -508,7 +509,7 @@ scm_c_with_fluids (SCM fluids, SCM values, SCM (*cproc) (), void *cdata) { SCM ans; long flen, vlen, i; - scm_i_thread *thread = SCM_I_CURRENT_THREAD; + scm_thread *thread = SCM_I_CURRENT_THREAD; SCM_VALIDATE_LIST_COPYLEN (1, fluids, flen); SCM_VALIDATE_LIST_COPYLEN (2, values, vlen); @@ -545,7 +546,7 @@ scm_c_with_fluid (SCM fluid, SCM value, SCM (*cproc) (), void *cdata) #define FUNC_NAME "scm_c_with_fluid" { SCM ans; - scm_i_thread *thread = SCM_I_CURRENT_THREAD; + scm_thread *thread = SCM_I_CURRENT_THREAD; scm_dynstack_push_fluid (&thread->dynstack, fluid, value, thread->dynamic_state); @@ -616,7 +617,7 @@ SCM_DEFINE (scm_set_current_dynamic_state, "set-current-dynamic-state", 1,0,0, "and return the previous current dynamic state object.") #define FUNC_NAME s_scm_set_current_dynamic_state { - scm_i_thread *t = SCM_I_CURRENT_THREAD; + scm_thread *t = SCM_I_CURRENT_THREAD; SCM old = scm_current_dynamic_state (); SCM_ASSERT (is_dynamic_state (state), state, SCM_ARG1, FUNC_NAME); restore_dynamic_state (get_dynamic_state (state), t->dynamic_state); -- cgit v1.2.3