diff options
author | Marius Vollmer <mvo@zagadka.de> | 2006-01-28 22:01:35 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2006-01-28 22:01:35 +0000 |
commit | d5ad4aa6fafe72e95833c3a5f4efab25e1388f82 (patch) | |
tree | 3fb028d3373349894aa24bbc3148790533daa877 | |
parent | fd0a5bbcb7922fe35a13d1cc87216c6b93f2251e (diff) | |
download | guile-d5ad4aa6fafe72e95833c3a5f4efab25e1388f82.tar.gz |
* inline.h, pairs.c (scm_is_pair): Moved scm_is_pair from pairs.c
to inline.h to make it inline.
-rw-r--r-- | libguile/inline.h | 16 | ||||
-rw-r--r-- | libguile/pairs.c | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/libguile/inline.h b/libguile/inline.h index 0a3ede28f..5a3300670 100644 --- a/libguile/inline.h +++ b/libguile/inline.h @@ -35,6 +35,7 @@ #include "libguile/gc.h" #include "libguile/threads.h" #include "libguile/unif.h" +#include "libguile/pairs.h" SCM_API SCM scm_cell (scm_t_bits car, scm_t_bits cdr); @@ -235,5 +236,20 @@ scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v) h->set (h, p, v); } +#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H +/* definitely inlining */ +#ifdef __GNUC__ +extern +#else +static +#endif +SCM_C_INLINE +#endif +int +scm_is_pair (SCM x) +{ + return SCM_I_CONSP (x); +} + #endif #endif diff --git a/libguile/pairs.c b/libguile/pairs.c index 609347675..34387cc89 100644 --- a/libguile/pairs.c +++ b/libguile/pairs.c @@ -78,12 +78,6 @@ SCM_DEFINE (scm_pair_p, "pair?", 1, 0, 0, } #undef FUNC_NAME -int -scm_is_pair (SCM x) -{ - return SCM_I_CONSP (x); -} - SCM scm_car (SCM pair) { |