summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/eval.c6
-rw-r--r--libguile/lang.c4
-rw-r--r--libguile/lang.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/libguile/eval.c b/libguile/eval.c
index fec45ac33..dad5aef6a 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -1044,7 +1044,7 @@ scm_m_cont (SCM xorig, SCM env SCM_UNUSED)
/* Multi-language support */
SCM_GLOBAL_SYMBOL (scm_lisp_nil, "nil");
-SCM_GLOBAL_SYMBOL (scm_t_lisp, "t");
+SCM_GLOBAL_SYMBOL (scm_lisp_t, "t");
SCM_SYNTAX (s_nil_cond, "nil-cond", scm_makmmacro, scm_m_nil_cond);
@@ -2419,7 +2419,7 @@ dispatch:
case (SCM_ISYMNUM (SCM_IM_T_IFY)):
x = SCM_CDR (x);
- RETURN (SCM_NFALSEP (EVALCAR (x, env)) ? scm_t_lisp : scm_lisp_nil)
+ RETURN (SCM_NFALSEP (EVALCAR (x, env)) ? scm_lisp_t : scm_lisp_nil)
case (SCM_ISYMNUM (SCM_IM_0_COND)):
proc = SCM_CDR (x);
@@ -4125,7 +4125,7 @@ scm_init_eval ()
#endif
scm_c_define ("nil", scm_lisp_nil);
- scm_c_define ("t", scm_t_lisp);
+ scm_c_define ("t", scm_lisp_t);
scm_add_feature ("delay");
}
diff --git a/libguile/lang.c b/libguile/lang.c
index ee15c66ac..82378e0ff 100644
--- a/libguile/lang.c
+++ b/libguile/lang.c
@@ -114,7 +114,7 @@ SCM_DEFINE (scm_null, "null", 1, 0, 0,
"return LISP's nil otherwise.")
#define FUNC_NAME s_scm_null
{
- return (SCM_NILP (x) || SCM_NULLP (x) || SCM_FALSEP (x)) ? scm_t_lisp : scm_lisp_nil;
+ return (SCM_NILP (x) || SCM_NULLP (x) || SCM_FALSEP (x)) ? scm_lisp_t : scm_lisp_nil;
}
#undef FUNC_NAME
@@ -146,7 +146,7 @@ SCM_DEFINE1 (scm_nil_eq, "nil-eq", scm_tc7_rpsubr,
return ((SCM_EQ_P (x, y)
|| (SCM_NILP (x) && (SCM_NULLP (y) || SCM_FALSEP (y)))
|| (SCM_NILP (y) && (SCM_NULLP (x) || SCM_FALSEP (x))))
- ? scm_t_lisp
+ ? scm_lisp_t
: scm_lisp_nil);
}
#undef FUNC_NAME
diff --git a/libguile/lang.h b/libguile/lang.h
index dfae81970..f0514d0c6 100644
--- a/libguile/lang.h
+++ b/libguile/lang.h
@@ -49,7 +49,7 @@
extern SCM scm_lisp_nil;
-extern SCM scm_t_lisp;
+extern SCM scm_lisp_t;
#define SCM_NILP(x) (SCM_EQ_P ((x), scm_lisp_nil))
#define SCM_NILNULLP(x) (SCM_NILP (x) || SCM_NULLP (x))