summaryrefslogtreecommitdiff
path: root/libguile/lang.h
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>2000-03-14 16:41:03 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>2000-03-14 16:41:03 +0000
commit43a912cfa649da0705e23dfcce50de72b84686cb (patch)
tree8517ce5a655c2d2c54f9e06ec1fb318c0ac65d68 /libguile/lang.h
parent5ebf0091ec6e5a9c9d3baaa6e7a6d5035b52f45b (diff)
downloadguile-43a912cfa649da0705e23dfcce50de72b84686cb.tar.gz
* eval.c, lang.c, lang.h (scm_lisp_nil, scm_lisp_t): Renamed from
scm_nil, scm_t. (Thanks to Dirk Herrmann.)
Diffstat (limited to 'libguile/lang.h')
-rw-r--r--libguile/lang.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/lang.h b/libguile/lang.h
index ec18d4e23..f0d6bf7c9 100644
--- a/libguile/lang.h
+++ b/libguile/lang.h
@@ -48,15 +48,15 @@
-extern SCM scm_nil;
-extern SCM scm_t;
+extern SCM scm_lisp_nil;
+extern SCM scm_lisp_t;
-#define SCM_NILP(x) ((x) == scm_nil)
+#define SCM_NILP(x) ((x) == scm_lisp_nil)
#define SCM_NILNULLP(x) (SCM_NILP (x) || SCM_NULLP (x))
-#define SCM_NIL2EOL(x, tmp) ((tmp = (x)) == scm_nil ? SCM_EOL : tmp)
-#define SCM_EOL2NIL(x, tmp) (SCM_NULLP (tmp = (x)) ? scm_nil : tmp)
+#define SCM_NIL2EOL(x, tmp) ((tmp = (x)) == scm_lisp_nil ? SCM_EOL : tmp)
+#define SCM_EOL2NIL(x, tmp) (SCM_NULLP (tmp = (x)) ? scm_lisp_nil : tmp)
#define SCM_EOL_IFY(x, tmp) (tmp = (x), SCM_NILP (tmp) ? SCM_EOL : tmp)
-#define SCM_NIL_IFY(x, tmp) (tmp = (x), SCM_NILP (tmp) ? scm_nil : tmp)
+#define SCM_NIL_IFY(x, tmp) (tmp = (x), SCM_NILP (tmp) ? scm_lisp_nil : tmp)