diff options
Diffstat (limited to 'libguile/conv-integer.i.c')
-rw-r--r-- | libguile/conv-integer.i.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libguile/conv-integer.i.c b/libguile/conv-integer.i.c index 0aa81dc74..7d6bd347e 100644 --- a/libguile/conv-integer.i.c +++ b/libguile/conv-integer.i.c @@ -29,7 +29,7 @@ SCM_TO_TYPE_PROTO (SCM val) if (SCM_I_INUMP (val)) { scm_t_signed_bits n = SCM_I_INUM (val); -#if SIZEOF_TYPE != 0 && SIZEOF_TYPE > SIZEOF_SCM_T_BITS +#if SIZEOF_TYPE != 0 && SIZEOF_TYPE > SIZEOF_UINTPTR_T return n; #else if (n >= TYPE_MIN && n <= TYPE_MAX) @@ -64,15 +64,15 @@ SCM_TO_TYPE_PROTO (SCM val) } else { - scm_t_uintmax abs_n; + uintmax_t abs_n; TYPE n; size_t count; if (mpz_sizeinbase (SCM_I_BIG_MPZ (val), 2) - > CHAR_BIT*sizeof (scm_t_uintmax)) + > CHAR_BIT*sizeof (uintmax_t)) goto out_of_range; - mpz_export (&abs_n, &count, 1, sizeof (scm_t_uintmax), 0, 0, + mpz_export (&abs_n, &count, 1, sizeof (uintmax_t), 0, 0, SCM_I_BIG_MPZ (val)); if (mpz_sgn (SCM_I_BIG_MPZ (val)) >= 0) @@ -113,7 +113,7 @@ SCM_TO_TYPE_PROTO (SCM val) SCM SCM_FROM_TYPE_PROTO (TYPE val) { -#if SIZEOF_TYPE != 0 && SIZEOF_TYPE < SIZEOF_SCM_T_BITS +#if SIZEOF_TYPE != 0 && SIZEOF_TYPE < SIZEOF_UINTPTR_T return SCM_I_MAKINUM (val); #else if (SCM_FIXABLE (val)) @@ -146,9 +146,3 @@ SCM_FROM_TYPE_PROTO (TYPE val) #undef SIZEOF_TYPE #undef SCM_TO_TYPE_PROTO #undef SCM_FROM_TYPE_PROTO - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ |