summaryrefslogtreecommitdiff
path: root/srfi/srfi-60.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-09-10 23:09:30 +0200
committerLudovic Courtès <ludo@gnu.org>2008-09-10 23:09:30 +0200
commit6f03035fe80d1c25ffadc42ec59c473402f65f60 (patch)
treea552a077bafe408ced8737674aecdf3007f31679 /srfi/srfi-60.c
parent328efeb9a66dddcf78a24fad96d3db58e9c3375d (diff)
parentc5cd474d8c37bf32d7236e63d754a0eee9eb9071 (diff)
downloadguile-6f03035fe80d1c25ffadc42ec59c473402f65f60.tar.gz
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts: libguile/Makefile.am libguile/coop-defs.h libguile/gc-card.c libguile/gc-freelist.c libguile/gc-malloc.c libguile/gc-mark.c libguile/gc-segment.c libguile/gc.c libguile/gc.h libguile/gc_os_dep.c libguile/hashtab.c libguile/hashtab.h libguile/inline.h libguile/private-gc.h libguile/struct.c libguile/struct.h libguile/threads.c libguile/threads.h libguile/vectors.h libguile/weaks.h test-suite/tests/gc.test
Diffstat (limited to 'srfi/srfi-60.c')
-rw-r--r--srfi/srfi-60.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/srfi/srfi-60.c b/srfi/srfi-60.c
index f631c6447..b90306a8e 100644
--- a/srfi/srfi-60.c
+++ b/srfi/srfi-60.c
@@ -18,7 +18,6 @@
*/
#include <libguile.h>
-#include "libguile/private-gc.h" /* for SCM_MIN */
#include "srfi-60.h"
@@ -332,7 +331,9 @@ SCM_DEFINE (scm_srfi60_integer_to_list, "integer->list", 1, 1, 0,
long nn = SCM_I_INUM (n);
for (i = 0; i < ll; i++)
{
- unsigned long shift = SCM_MIN (i, (unsigned long) SCM_LONG_BIT-1);
+ unsigned long shift =
+ (i < ((unsigned long) SCM_LONG_BIT-1))
+ ? i : ((unsigned long) SCM_LONG_BIT-1);
int bit = (nn >> shift) & 1;
ret = scm_cons (scm_from_bool (bit), ret);
}