summaryrefslogtreecommitdiff
path: root/libguile/fluids.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-12-01 23:31:50 +0100
committerAndy Wingo <wingo@pobox.com>2011-12-01 23:31:50 +0100
commitb2208d2e987759270c712e35c8164394a47a52aa (patch)
tree1edd39e74a266fc53c075d328696e8fbf33eba5b /libguile/fluids.h
parent3dc9f41900a0e9f915da3aa1eea6e0fae829c40d (diff)
parent738c899e4c1ab9d25cfbcd1010f34e0cce400bca (diff)
downloadguile-b2208d2e987759270c712e35c8164394a47a52aa.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: configure.ac libguile/fluids.c libguile/gc.c libguile/gc.h libguile/objcodes.c libguile/procprop.c libguile/vm.c module/ice-9/psyntax-pp.scm module/ice-9/psyntax.scm
Diffstat (limited to 'libguile/fluids.h')
-rw-r--r--libguile/fluids.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libguile/fluids.h b/libguile/fluids.h
index 09de7366f..7d134b922 100644
--- a/libguile/fluids.h
+++ b/libguile/fluids.h
@@ -56,10 +56,12 @@
#define SCM_FLUID_P(x) (SCM_HAS_TYP7 (x, scm_tc7_fluid))
#ifdef BUILDING_LIBGUILE
-#define SCM_I_FLUID_NUM(x) ((size_t)SCM_CELL_WORD_1(x))
+#define SCM_I_FLUID_NUM(x) ((size_t)(SCM_CELL_WORD_0 (x) >> 8))
+#define SCM_I_FLUID_DEFAULT(x) (SCM_CELL_OBJECT_1 (x))
#endif
SCM_API SCM scm_make_fluid (void);
+SCM_API SCM scm_make_fluid_with_default (SCM dflt);
SCM_API SCM scm_make_unbound_fluid (void);
SCM_API int scm_is_fluid (SCM obj);
SCM_API SCM scm_fluid_p (SCM fl);