diff options
author | Andy Wingo <wingo@pobox.com> | 2010-07-17 12:10:52 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-07-17 13:31:06 +0200 |
commit | 6f8d7b12bbcc5be470bb6421bcd70d5806bce04b (patch) | |
tree | da45e820d04bc33ea6027bafdf97fb8c2e7a9242 /libguile/vm-i-system.c | |
parent | 0f3a70cfa897530cdc50aa768d73d41419a5b360 (diff) | |
download | guile-6f8d7b12bbcc5be470bb6421bcd70d5806bce04b.tar.gz |
SCM_I_FLUID_P -> SCM_FLUID_P
* libguile/fluids.h (SCM_FLUID_P): Change from SCM_I_FLUID_P.
(SCM_I_FLUID_NUM, SCM_I_DYNAMIC_STATE_P, SCM_I_DYNAMIC_STATE_FLUIDS):
Wrap in BUILDING_LIBGUILE ifdef.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 11f8ae0d8..3af63082a 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -1594,7 +1594,7 @@ VM_DEFINE_INSTRUCTION (92, fluid_ref, "fluid-ref", 0, 1, 1) CHECK_UNDERFLOW (); fluids = SCM_I_DYNAMIC_STATE_FLUIDS (dynstate); - if (SCM_UNLIKELY (!SCM_I_FLUID_P (*sp)) + if (SCM_UNLIKELY (!SCM_FLUID_P (*sp)) || ((num = SCM_I_FLUID_NUM (*sp)) >= SCM_SIMPLE_VECTOR_LENGTH (fluids))) { /* Punt dynstate expansion and error handling to the C proc. */ @@ -1615,7 +1615,7 @@ VM_DEFINE_INSTRUCTION (93, fluid_set, "fluid-set", 0, 2, 0) POP (val); POP (fluid); fluids = SCM_I_DYNAMIC_STATE_FLUIDS (dynstate); - if (SCM_UNLIKELY (!SCM_I_FLUID_P (fluid)) + if (SCM_UNLIKELY (!SCM_FLUID_P (fluid)) || ((num = SCM_I_FLUID_NUM (fluid)) >= SCM_SIMPLE_VECTOR_LENGTH (fluids))) { /* Punt dynstate expansion and error handling to the C proc. */ |