Adapt GDB integration to newest patches

[bpt/guile.git] / libguile / conv-uinteger.i.c

diff --git a/libguile/conv-uinteger.i.c b/libguile/conv-uinteger.i.c
index 7f1e0dc..d6b969c 100644 (file)
--- a/libguile/conv-uinteger.i.c
+++ b/libguile/conv-uinteger.i.c
@@ -35,7 +35,9 @@ SCM_TO_TYPE_PROTO (SCM val)
       else
        {
        out_of_range:
-         scm_out_of_range (NULL, val);
+         scm_i_range_error (val,
+                            scm_from_unsigned_integer (TYPE_MIN),
+                            scm_from_unsigned_integer (TYPE_MAX));
          return 0;
        }
     }
@@ -51,10 +53,12 @@ SCM_TO_TYPE_PROTO (SCM val)
 #if SIZEOF_TYPE != 0 && SIZEOF_TYPE > SCM_SIZEOF_LONG
              return n;
 #else
-             if (n >= TYPE_MIN && n <= TYPE_MAX)
-               return n;
-             else
-               goto out_of_range;
+
+              if (n >= TYPE_MIN && n <= TYPE_MAX)
+                return n;
+              else
+                goto out_of_range;
+
 #endif
            }
          else
@@ -76,8 +80,9 @@ SCM_TO_TYPE_PROTO (SCM val)
 
          if (n >= TYPE_MIN && n <= TYPE_MAX)
            return n;
-         else
-           goto out_of_range;
+          else
+            goto out_of_range;
+
        }
     }
   else
@@ -96,11 +101,7 @@ SCM_FROM_TYPE_PROTO (TYPE val)
   if (SCM_POSFIXABLE (val))
     return SCM_I_MAKINUM (val);
   else if (val <= ULONG_MAX)
-    {
-      SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
-      mpz_init_set_ui (SCM_I_BIG_MPZ (z), val);
-      return z;
-    }
+    return scm_i_ulong2big (val);
   else
     {
       SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);