summaryrefslogtreecommitdiff
path: root/libguile/conv-integer.i.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-17 19:21:42 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-17 19:21:42 +0200
commit7b4ab0895b51f21d9f15581d2407861bac986231 (patch)
treef9664801173edaae821caaf8e597ab7fa65d521d /libguile/conv-integer.i.c
parentea3c5cf9099741869043c56bc57f48c46976dc79 (diff)
downloadguile-7b4ab0895b51f21d9f15581d2407861bac986231.tar.gz
Inline definition of SIZEOF_SCM_T_BITS
* libguile/_scm.h (SIZEOF_SCM_T_BITS): Remove definition. * libguile/conv-integer.i.c (SCM_TO_TYPE_PROTO, SCM_FROM_TYPE_PROTO): * libguile/conv-uinteger.i.c (SCM_FROM_TYPE_PROTO): * libguile/gc.c (DEFAULT_INITIAL_HEAP_SIZE): * libguile/hashtab.c: * libguile/loader.c: * libguile/socket.c: * libguile/vm-engine.c (VM_NAME): Use SIZEOF_UINTPTR_T instead of SIZEOF_SCM_T_BITS.
Diffstat (limited to 'libguile/conv-integer.i.c')
-rw-r--r--libguile/conv-integer.i.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/conv-integer.i.c b/libguile/conv-integer.i.c
index 0aa81dc74..2a020b316 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)
@@ -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))