--- libguile/hash.c
+++ libguile/hash.c
@@ -161,7 +161,7 @@
 unsigned int
 scm_ihashq (SCM obj, unsigned int n)
 {
-  return (SCM_UNPACK (obj) >> 1) % n;
+  return ((unsigned long) SCM_UNPACK (obj) >> 1) % n;
 }
 
 
@@ -196,7 +196,7 @@
   if (SCM_NUMP(obj))
     return (unsigned int) scm_hasher(obj, n, 10);
   else
-    return SCM_UNPACK (obj) % n;
+    return (unsigned long) SCM_UNPACK (obj) % n;
 }
 
 
--- libguile/struct.c
+++ libguile/struct.c
@@ -690,7 +690,7 @@
 {
   /* The length of the hash table should be a relative prime it's not
      necessary to shift down the address.  */
-  return SCM_UNPACK (obj) % n;
+  return (unsigned long) SCM_UNPACK (obj) % n;
 }
 
 SCM