diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-07-08 15:41:48 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-07-08 15:41:48 +0000 |
commit | 5a572ca13c2258defb9355122febf4f04276b97e (patch) | |
tree | d340767309574e2d1b4c7d0191d07f89758493f8 | |
parent | d19905925431ab12bbdcf5c26cd6478fad7755fb (diff) | |
download | guile-5a572ca13c2258defb9355122febf4f04276b97e.tar.gz |
* numbers.h (SCM_MAKINUM, SCM_I_MAKINUM): Renamed SCM_MAKINUM to
SCM_I_MAKINUM and changed all uses.
* deprecated.h, deprecated.c (SCM_MAKINUM): Newly deprecated.
-rw-r--r-- | libguile/deprecated.c | 2 | ||||
-rw-r--r-- | libguile/deprecated.h | 2 | ||||
-rw-r--r-- | libguile/numbers.h | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/libguile/deprecated.c b/libguile/deprecated.c index c3dc8bbee..a0275ccb9 100644 --- a/libguile/deprecated.c +++ b/libguile/deprecated.c @@ -1105,7 +1105,6 @@ SCM_DEFINE (scm_gentemp, "gentemp", 0, 2, 0, } #undef FUNC_NAME -#if 0 SCM SCM_MAKINUM (scm_t_signed_bits val) { @@ -1113,7 +1112,6 @@ SCM_MAKINUM (scm_t_signed_bits val) ("SCM_MAKINUM is deprecated. Use scm_from_int or similar instead."); return scm_from_int (val); } -#endif void scm_i_init_deprecated () diff --git a/libguile/deprecated.h b/libguile/deprecated.h index 0091d7c46..039ec540f 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -323,9 +323,7 @@ SCM_API SCM scm_gentemp (SCM prefix, SCM obarray); ^ (SCM_UNPACK (SCM_BOOL_T) \ ^ SCM_UNPACK (SCM_BOOL_F)))) -#if 0 SCM_API SCM SCM_MAKINUM (scm_t_signed_bits val); -#endif void scm_i_init_deprecated (void); diff --git a/libguile/numbers.h b/libguile/numbers.h index af1f9252a..47e8cfe42 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -68,7 +68,7 @@ #define SCM_INUMP(x) (2 & SCM_UNPACK (x)) #define SCM_NINUMP(x) (!SCM_INUMP (x)) -#define SCM_MAKINUM(x) \ +#define SCM_I_MAKINUM(x) \ (SCM_PACK ((((scm_t_signed_bits) (x)) << 2) + scm_tc2_int)) #define SCM_INUM(x) (SCM_SRS ((scm_t_signed_bits) SCM_UNPACK (x), 2)) @@ -79,7 +79,7 @@ /* A name for 0. */ -#define SCM_INUM0 (SCM_MAKINUM (0)) +#define SCM_INUM0 (SCM_I_MAKINUM (0)) /* SCM_MAXEXP is the maximum double precision exponent * SCM_FLTMAX is less than or scm_equal the largest single precision float |