=================================================================== RCS file: /home/cvs/OpenXM_contrib/gmp/mpz/Attic/tdiv_r_2exp.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.3 diff -u -p -r1.1.1.1 -r1.1.1.3 --- OpenXM_contrib/gmp/mpz/Attic/tdiv_r_2exp.c 2000/01/10 15:35:27 1.1.1.1 +++ OpenXM_contrib/gmp/mpz/Attic/tdiv_r_2exp.c 2003/08/25 16:06:34 1.1.1.3 @@ -1,20 +1,20 @@ /* mpz_tdiv_r_2exp -- Divide a integer by 2**CNT and produce a remainder. -Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc. +Copyright 1991, 1993, 1994, 1995, 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,18 +23,11 @@ MA 02111-1307, USA. */ #include "gmp-impl.h" void -#if __STDC__ mpz_tdiv_r_2exp (mpz_ptr res, mpz_srcptr in, unsigned long int cnt) -#else -mpz_tdiv_r_2exp (res, in, cnt) - mpz_ptr res; - mpz_srcptr in; - unsigned long int cnt; -#endif { mp_size_t in_size = ABS (in->_mp_size); mp_size_t res_size; - mp_size_t limb_cnt = cnt / BITS_PER_MP_LIMB; + mp_size_t limb_cnt = cnt / GMP_NUMB_BITS; mp_srcptr in_ptr = in->_mp_d; if (in_size > limb_cnt) @@ -42,7 +35,7 @@ mpz_tdiv_r_2exp (res, in, cnt) /* The input operand is (probably) greater than 2**CNT. */ mp_limb_t x; - x = in_ptr[limb_cnt] & (((mp_limb_t) 1 << cnt % BITS_PER_MP_LIMB) - 1); + x = in_ptr[limb_cnt] & (((mp_limb_t) 1 << cnt % GMP_NUMB_BITS) - 1); if (x != 0) { res_size = limb_cnt + 1;