===================================================================
RCS file: /home/cvs/OpenXM_contrib/gmp/mpz/Attic/cmp_si.c,v
retrieving revision 1.1
retrieving revision 1.1.1.3
diff -u -p -r1.1 -r1.1.1.3
--- OpenXM_contrib/gmp/mpz/Attic/cmp_si.c	2000/01/10 15:35:27	1.1
+++ OpenXM_contrib/gmp/mpz/Attic/cmp_si.c	2003/08/25 16:06:32	1.1.1.3
@@ -1,21 +1,22 @@
 /* mpz_cmp_si(u,v) -- Compare an integer U with a single-word int V.
    Return positive, zero, or negative based on if U > V, U == V, or U < V.
 
-Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1995, 1996, 2000, 2001, 2002 Free Software
+Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at your
 option) any later version.
 
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
-You should have received a copy of the GNU Library General Public License
+You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
@@ -23,22 +24,23 @@ MA 02111-1307, USA. */
 #include "gmp.h"
 #include "gmp-impl.h"
 
-/* gmp.h defines a macro for mpz_cmp_si.  */
-#undef mpz_cmp_si
-
 int
-#if __STDC__
-mpz_cmp_si (mpz_srcptr u, signed long int v_digit)
-#else
-mpz_cmp_si (u, v_digit)
-     mpz_srcptr u;
-     signed long int v_digit;
-#endif
+_mpz_cmp_si (mpz_srcptr u, signed long int v_digit)
 {
   mp_size_t usize = u->_mp_size;
   mp_size_t vsize;
   mp_limb_t u_digit;
 
+#if GMP_NAIL_BITS != 0
+  /* FIXME.  This isn't very pretty.  */
+  mpz_t tmp;
+  mp_limb_t tt[2];
+  PTR(tmp) = tt;
+  ALLOC(tmp) = 2;
+  mpz_set_si (tmp, v_digit);
+  return mpz_cmp (u, tmp);
+#endif
+
   vsize = 0;
   if (v_digit > 0)
     vsize = 1;
@@ -56,10 +58,10 @@ mpz_cmp_si (u, v_digit)
 
   u_digit = u->_mp_d[0];
 
-  if (u_digit == v_digit)
+  if (u_digit == (mp_limb_t) (unsigned long) v_digit)
     return 0;
 
-  if (u_digit > v_digit)
+  if (u_digit > (mp_limb_t) (unsigned long) v_digit)
     return usize;
   else
     return -usize;