diff options
Diffstat (limited to 'libguile/deprecated.h')
-rw-r--r-- | libguile/deprecated.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libguile/deprecated.h b/libguile/deprecated.h index dd9c68bd9..d14790740 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -5,7 +5,7 @@ #ifndef SCM_DEPRECATED_H #define SCM_DEPRECATED_H -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003,2004 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,14 +67,10 @@ SCM_API const char scm_s_formals[]; #define SCM_EVALIM(x, env) (SCM_ILOCP (x) \ ? *scm_ilookup ((x), env) \ : SCM_EVALIM2(x)) -#define SCM_XEVAL(x, env) (SCM_IMP (x) \ - ? SCM_EVALIM2(x) \ - : (*scm_ceval_ptr) ((x), (env))) -#define SCM_XEVALCAR(x, env) (SCM_IMP (SCM_CAR (x)) \ - ? SCM_EVALIM (SCM_CAR (x), env) \ - : (SCM_SYMBOLP (SCM_CAR (x)) \ - ? *scm_lookupcar (x, env, 1) \ - : (*scm_ceval_ptr) (SCM_CAR (x), env))) +#define SCM_XEVAL(x, env) (scm_i_eval_x ((x), (env))) +#define SCM_XEVALCAR(x, env) (SCM_SYMBOLP (SCM_CAR (x)) \ + ? *scm_lookupcar (x, env, 1) \ + : scm_i_eval_x (SCM_CAR (x), (env))) #define scm_substring_move_left_x scm_substring_move_x |