diff --git a/libguile/ChangeLog b/libguile/ChangeLog index a8b1ba43d..c47b0898a 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,8 @@ +2002-12-29 Neil Jerram + + * lang.h: Remove declarations matching definitions removed from + lang.c (just below). + 2002-12-28 Neil Jerram * lang.c (scm_nil_cons, scm_nil_car, scm_nil_cdr, scm_null, diff --git a/libguile/lang.h b/libguile/lang.h index dba8a8f28..07585bce5 100644 --- a/libguile/lang.h +++ b/libguile/lang.h @@ -54,28 +54,12 @@ #define SCM_NILP(x) (SCM_EQ_P ((x), SCM_ELISP_NIL)) -#if 0 -SCM_API SCM scm_lisp_nil; -SCM_API SCM scm_lisp_t; - -#define SCM_NILNULLP(x) (SCM_NILP (x) || SCM_NULLP (x)) -#define SCM_NIL2EOL(x, tmp) (SCM_EQ_P ((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_lisp_nil : tmp) - - - -SCM_API SCM scm_nil_cons (SCM x, SCM y); -SCM_API SCM scm_nil_car (SCM x); -SCM_API SCM scm_nil_cdr (SCM x); -SCM_API SCM scm_null (SCM x); -SCM_API SCM scm_m_while (SCM exp, SCM env); -SCM_API SCM scm_nil_eq (SCM x, SCM y); -#endif /* 0 */ SCM_API void scm_init_lang (void); + #else /* ! SCM_ENABLE_ELISP */ + #define SCM_NILP(x) 0 + #endif /* ! SCM_ENABLE_ELISP */ #define SCM_NULL_OR_NIL_P(x) (SCM_NULLP (x) || SCM_NILP (x))