diff options
author | Kevin Ryde <user42@zip.com.au> | 2001-11-30 01:39:14 +0100 |
---|---|---|
committer | Kevin Ryde <user42@zip.com.au> | 2001-11-30 01:39:14 +0100 |
commit | a30a00c444bb3d2b90c14b488c66fafa7df3c631 (patch) | |
tree | 8a7ce3e110086e9371072f0c8a7e5151f60f290b /mpfr/cmp_ui.c | |
parent | 1778ba984df3d10a3a95e58ce8990fa0b431c3a3 (diff) | |
download | gmp-a30a00c444bb3d2b90c14b488c66fafa7df3c631.tar.gz |
* mpfr: Update to 2001-11-16. Patch TMP handling of agm.c and sqrt.c,
separate .c files for floor and ceil.
Diffstat (limited to 'mpfr/cmp_ui.c')
-rw-r--r-- | mpfr/cmp_ui.c | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/mpfr/cmp_ui.c b/mpfr/cmp_ui.c index 364881970..421d2b43a 100644 --- a/mpfr/cmp_ui.c +++ b/mpfr/cmp_ui.c @@ -1,20 +1,20 @@ /* mpfr_cmp_ui -- compare a floating-point number with a machine integer -Copyright (C) 1999 Free Software Foundation. +Copyright (C) 1999, 2001 Free Software Foundation, Inc. This file is part of the MPFR Library. The MPFR 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 MPFR 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 MPFR 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. */ @@ -32,23 +32,17 @@ MA 02111-1307, USA. */ */ int -#if __STDC__ mpfr_cmp_ui_2exp (mpfr_srcptr b, unsigned long int i, int f ) -#else -mpfr_cmp_ui_2exp (b, i, f) - mpfr_srcptr b; - unsigned long int i; - int f; -#endif { int e, k, bn; mp_limb_t c, *bp; if (MPFR_IS_NAN(b)) return 1; - if (MPFR_SIGN(b) < 0) return -1; - /* now b>=0 */ - else if (MPFR_IS_INF(b)) return 1; - else if (!MPFR_NOTZERO(b)) return((i) ? -1 : 0); + if (MPFR_IS_INF(b)) return (MPFR_SIGN(b) > 0) ? 1 : -1; + + /* now b is neither NaN nor +/-Infinity */ + if (!MPFR_NOTZERO(b)) return((i) ? -1 : 0); + else if (MPFR_SIGN(b) < 0) return -1; /* now b>0 */ else if (i==0) return 1; else { /* b>0, i>0 */ @@ -80,14 +74,7 @@ mpfr_cmp_ui_2exp (b, i, f) */ int -#if __STDC__ mpfr_cmp_si_2exp (mpfr_srcptr b, long int i, int f ) -#else -mpfr_cmp_si_2exp (b, i, f) - mpfr_srcptr b; - long int i; - int f; -#endif { int e, k, bn, si; mp_limb_t c, *bp; |