summaryrefslogtreecommitdiff
path: root/libguile/eval.h
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-05-06 16:43:14 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-05-06 16:43:14 +0000
commitf5710d53b1a67d7b965701b4b34004b9db1a6813 (patch)
treee6e4e2a562a827adba4f3c374c1152016dd6b68c /libguile/eval.h
parent41a2f6fc0c62afeb09bd7fbae4e9eca794c26bbe (diff)
downloadguile-f5710d53b1a67d7b965701b4b34004b9db1a6813.tar.gz
Use SCM_SMOB_* instead of SCM_CELL_* as appropriate. Use
SCM_SMOB_FLAGS and SCM_SET_SMOB_FLAGS instead of accessing the zeroth word directly. Use SCM_SMOB_PREDICATE as appropriate.
Diffstat (limited to 'libguile/eval.h')
-rw-r--r--libguile/eval.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/libguile/eval.h b/libguile/eval.h
index 4269c5a71..5ea3b8fd7 100644
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -66,15 +66,17 @@ SCM_API SCM scm_eval_options_interface (SCM setting);
/* {Promises}
*/
-#define SCM_F_PROMISE_COMPUTED (1L << 16)
+#define SCM_F_PROMISE_COMPUTED (1L << 0)
#define SCM_PROMISE_COMPUTED_P(promise) \
- (SCM_F_PROMISE_COMPUTED & SCM_CELL_WORD_0 (promise))
+ (SCM_F_PROMISE_COMPUTED & SCM_SMOB_FLAGS (promise))
#define SCM_SET_PROMISE_COMPUTED(promise) \
- SCM_SET_CELL_WORD_0 (promise, scm_tc16_promise | SCM_F_PROMISE_COMPUTED)
+ SCM_SET_SMOB_FLAGS ((promise), SCM_F_PROMISE_COMPUTED)
#define SCM_PROMISE_MUTEX(promise) \
- ((scm_t_rec_mutex *) SCM_CELL_WORD_2 (promise))
-#define SCM_PROMISE_DATA SCM_CELL_OBJECT_1
-#define SCM_SET_PROMISE_DATA SCM_SET_CELL_OBJECT_1
+ ((scm_t_rec_mutex *) SCM_SMOB_DATA_2 (promise))
+#define SCM_PROMISE_DATA SCM_SMOB_OBJECT
+#define SCM_SET_PROMISE_DATA SCM_SET_SMOB_OBJECT
+
+
SCM_API scm_t_bits scm_tc16_promise;