summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mpn/generic/addsub_n.c9
-rw-r--r--mpn/generic/bdivmod.c12
-rw-r--r--mpn/generic/cmp.c9
-rw-r--r--mpn/generic/dc_divrem_n.c18
-rw-r--r--mpn/generic/diveby3.c10
-rw-r--r--mpn/generic/divrem.c12
-rw-r--r--mpn/generic/divrem_2.c11
-rw-r--r--mpn/generic/dump.c8
-rw-r--r--mpn/generic/gcd.c22
-rw-r--r--mpn/generic/gcd_1.c9
-rw-r--r--mpn/generic/gcdext.c31
-rw-r--r--mpn/generic/get_str.c10
-rw-r--r--mpn/generic/jacbase.c9
-rw-r--r--mpn/generic/lshift.c23
-rw-r--r--mpn/generic/mod_1_rs.c10
-rw-r--r--mpn/generic/mul_basecase.c11
-rw-r--r--mpn/generic/perfsqr.c8
-rw-r--r--mpn/generic/popham.c7
-rw-r--r--mpn/generic/pre_mod_1.c10
-rw-r--r--mpn/generic/random.c8
-rw-r--r--mpn/generic/random2.c8
-rw-r--r--mpn/generic/rshift.c24
-rw-r--r--mpn/generic/sb_divrem_mn.c11
-rw-r--r--mpn/generic/scan0.c8
-rw-r--r--mpn/generic/scan1.c8
-rw-r--r--mpn/generic/set_str.c10
-rw-r--r--mpn/generic/sqr_basecase.c9
-rw-r--r--mpn/generic/tdiv_qr.c13
28 files changed, 28 insertions, 310 deletions
diff --git a/mpn/generic/addsub_n.c b/mpn/generic/addsub_n.c
index 166c87d4a..d35c31d6d 100644
--- a/mpn/generic/addsub_n.c
+++ b/mpn/generic/addsub_n.c
@@ -1,6 +1,6 @@
/* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
-Copyright 1999, 2000 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -35,14 +35,7 @@ MA 02111-1307, USA. */
All operands have n limbs.
In-place operations allowed. */
mp_limb_t
-#if __STDC__
mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp_srcptr s1p, mp_srcptr s2p, mp_size_t n)
-#else
-mpn_addsub_n (r1p, r2p, s1p, s2p, n)
- mp_ptr r1p, r2p;
- mp_srcptr s1p, s2p;
- mp_size_t n;
-#endif
{
mp_limb_t acyn, acyo; /* carry for add */
mp_limb_t scyn, scyo; /* carry for subtract */
diff --git a/mpn/generic/bdivmod.c b/mpn/generic/bdivmod.c
index 3127a924f..25901fd71 100644
--- a/mpn/generic/bdivmod.c
+++ b/mpn/generic/bdivmod.c
@@ -1,6 +1,6 @@
/* mpn/bdivmod.c: mpn_bdivmod for computing U/V mod 2^d.
-Copyright 1991, 1993, 1994, 1995, 1996, 1999, 2000 Free Software
+Copyright 1991, 1993, 1994, 1995, 1996, 1999, 2000, 2001 Free Software
Foundation, Inc.
This file is part of the GNU MP Library.
@@ -54,18 +54,8 @@ MA 02111-1307, USA. */
mp_limb_t
-#if __STDC__
mpn_bdivmod (mp_ptr qp, mp_ptr up, mp_size_t usize,
mp_srcptr vp, mp_size_t vsize, unsigned long int d)
-#else
-mpn_bdivmod (qp, up, usize, vp, vsize, d)
- mp_ptr qp;
- mp_ptr up;
- mp_size_t usize;
- mp_srcptr vp;
- mp_size_t vsize;
- unsigned long int d;
-#endif
{
mp_limb_t v_inv;
diff --git a/mpn/generic/cmp.c b/mpn/generic/cmp.c
index ca8d3d9c2..1fefbdc81 100644
--- a/mpn/generic/cmp.c
+++ b/mpn/generic/cmp.c
@@ -1,6 +1,6 @@
/* mpn_cmp -- Compare two low-level natural-number integers.
-Copyright 1991, 1993, 1994, 1996, 2000 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -28,14 +28,7 @@ MA 02111-1307, USA. */
Return 1 if OP1 > OP2, 0 if they are equal, and -1 if OP1 < OP2. */
int
-#if __STDC__
mpn_cmp (mp_srcptr op1_ptr, mp_srcptr op2_ptr, mp_size_t size)
-#else
-mpn_cmp (op1_ptr, op2_ptr, size)
- mp_srcptr op1_ptr;
- mp_srcptr op2_ptr;
- mp_size_t size;
-#endif
{
mp_size_t i;
mp_limb_t op1_word, op2_word;
diff --git a/mpn/generic/dc_divrem_n.c b/mpn/generic/dc_divrem_n.c
index 1d2462493..f8a14899a 100644
--- a/mpn/generic/dc_divrem_n.c
+++ b/mpn/generic/dc_divrem_n.c
@@ -6,7 +6,7 @@
FUTURE GNU MP RELEASE.
-Copyright 2000 Free Software Foundation, Inc.
+Copyright 2000, 2001 Free Software Foundation, Inc.
Contributed by Paul Zimmermann.
This file is part of the GNU MP Library.
@@ -71,15 +71,7 @@ unused_mpn_divrem (qp, qxn, np, nn, dp, dn)
Requires that the most significant bit of the divisor is set. */
mp_limb_t
-#if __STDC__
mpn_dc_divrem_n (mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n)
-#else
-mpn_dc_divrem_n (qp, np, dp, n)
- mp_ptr qp;
- mp_ptr np;
- mp_srcptr dp;
- mp_size_t n;
-#endif
{
mp_limb_t qhl, cc;
@@ -112,15 +104,7 @@ mpn_dc_divrem_n (qp, np, dp, n)
the remainder in (np, 2n) */
static mp_limb_t
-#if __STDC__
mpn_dc_div_3_halves_by_2 (mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n)
-#else
-mpn_dc_div_3_halves_by_2 (qp, np, dp, n)
- mp_ptr qp;
- mp_ptr np;
- mp_srcptr dp;
- mp_size_t n;
-#endif
{
mp_size_t twon = n + n;
mp_limb_t qhl, cc;
diff --git a/mpn/generic/diveby3.c b/mpn/generic/diveby3.c
index cb7301f59..9cfe24d0b 100644
--- a/mpn/generic/diveby3.c
+++ b/mpn/generic/diveby3.c
@@ -1,7 +1,7 @@
/* mpn_divexact_by3 -- mpn division by 3, expecting no remainder. */
/*
-Copyright 2000 Free Software Foundation, Inc.
+Copyright 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -44,15 +44,7 @@ MA 02111-1307, USA.
5 simple operations per limb. */
mp_limb_t
-#if __STDC__
mpn_divexact_by3c (mp_ptr dst, mp_srcptr src, mp_size_t size, mp_limb_t c)
-#else
-mpn_divexact_by3c (dst, src, size, c)
- mp_ptr dst;
- mp_srcptr src;
- mp_size_t size;
- mp_limb_t c;
-#endif
{
mp_size_t i;
diff --git a/mpn/generic/divrem.c b/mpn/generic/divrem.c
index a900de073..8f6e1d92d 100644
--- a/mpn/generic/divrem.c
+++ b/mpn/generic/divrem.c
@@ -2,7 +2,7 @@
quotient. This is now just a middle layer for calling the new
internal mpn_tdiv_qr.
-Copyright 1993, 1994, 1995, 1996, 1997, 1999, 2000 Free Software
+Copyright 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001 Free Software
Foundation, Inc.
This file is part of the GNU MP Library.
@@ -27,19 +27,9 @@ MA 02111-1307, USA. */
#include "longlong.h"
mp_limb_t
-#if __STDC__
mpn_divrem (mp_ptr qp, mp_size_t qxn,
mp_ptr np, mp_size_t nn,
mp_srcptr dp, mp_size_t dn)
-#else
-mpn_divrem (qp, qxn, np, nn, dp, dn)
- mp_ptr qp;
- mp_size_t qxn;
- mp_ptr np;
- mp_size_t nn;
- mp_srcptr dp;
- mp_size_t dn;
-#endif
{
ASSERT (qxn >= 0);
ASSERT (nn >= dn);
diff --git a/mpn/generic/divrem_2.c b/mpn/generic/divrem_2.c
index ac9617b38..cd7285bce 100644
--- a/mpn/generic/divrem_2.c
+++ b/mpn/generic/divrem_2.c
@@ -7,7 +7,7 @@
RELEASE.
-Copyright 1993, 1994, 1995, 1996, 1999, 2000 Free Software Foundation,
+Copyright 1993, 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
Inc.
This file is part of the GNU MP Library.
@@ -48,18 +48,9 @@ MA 02111-1307, USA. */
3. NSIZE >= 2, even if QEXTRA_LIMBS is non-zero. */
mp_limb_t
-#if __STDC__
mpn_divrem_2 (mp_ptr qp, mp_size_t qxn,
mp_ptr np, mp_size_t nsize,
mp_srcptr dp)
-#else
-mpn_divrem_2 (qp, qxn, np, nsize, dp)
- mp_ptr qp;
- mp_size_t qxn;
- mp_ptr np;
- mp_size_t nsize;
- mp_srcptr dp;
-#endif
{
mp_limb_t most_significant_q_limb = 0;
mp_size_t i;
diff --git a/mpn/generic/dump.c b/mpn/generic/dump.c
index 8bc4a5b09..dfd720b39 100644
--- a/mpn/generic/dump.c
+++ b/mpn/generic/dump.c
@@ -3,7 +3,7 @@
FUNCTION WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
-Copyright 1996, 2000 Free Software Foundation, Inc.
+Copyright 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -28,13 +28,7 @@ MA 02111-1307, USA.
#include "gmp-impl.h"
void
-#if __STDC__
mpn_dump (mp_srcptr ptr, mp_size_t size)
-#else
-mpn_dump (ptr, size)
- mp_srcptr ptr;
- mp_size_t size;
-#endif
{
MPN_NORMALIZE (ptr, size);
diff --git a/mpn/generic/gcd.c b/mpn/generic/gcd.c
index 6e388c0d5..15a649355 100644
--- a/mpn/generic/gcd.c
+++ b/mpn/generic/gcd.c
@@ -1,6 +1,6 @@
/* mpn/gcd.c: mpn_gcd for gcd of two odd integers.
-Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000 Free Software
+Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001 Free Software
Foundation, Inc.
This file is part of the GNU MP Library.
@@ -67,13 +67,7 @@ enum
/* Use binary algorithm to compute V <-- GCD (V, U) for usize, vsize == 2.
Both U and V must be odd. */
static inline mp_size_t
-#if __STDC__
gcd_2 (mp_ptr vp, mp_srcptr up)
-#else
-gcd_2 (vp, up)
- mp_ptr vp;
- mp_srcptr up;
-#endif
{
mp_limb_t u0, u1, v0, v1;
mp_size_t vsize;
@@ -132,12 +126,7 @@ static
inline /* don't inline this for the x86 */
#endif
mp_limb_t
-#if __STDC__
find_a (mp_srcptr cp)
-#else
-find_a (cp)
- mp_srcptr cp;
-#endif
{
unsigned long int leading_zero_bits = 0;
@@ -179,16 +168,7 @@ find_a (cp)
mp_size_t
-#if __STDC__
mpn_gcd (mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsize)
-#else
-mpn_gcd (gp, up, usize, vp, vsize)
- mp_ptr gp;
- mp_ptr up;
- mp_size_t usize;
- mp_ptr vp;
- mp_size_t vsize;
-#endif
{
mp_ptr orig_vp = vp;
mp_size_t orig_vsize = vsize;
diff --git a/mpn/generic/gcd_1.c b/mpn/generic/gcd_1.c
index ea1bac2e9..3a3fade4c 100644
--- a/mpn/generic/gcd_1.c
+++ b/mpn/generic/gcd_1.c
@@ -1,6 +1,6 @@
/* mpn_gcd_1 -- mpn and limb greatest common divisor.
-Copyright 1994, 1996, 2000 Free Software Foundation, Inc.
+Copyright 1994, 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -27,14 +27,7 @@ MA 02111-1307, USA. */
V == 0 since gcd(x,0) = x, and U does not generally fit in an mp_limb_t. */
mp_limb_t
-#if __STDC__
mpn_gcd_1 (mp_srcptr up, mp_size_t size, mp_limb_t vlimb)
-#else
-mpn_gcd_1 (up, size, vlimb)
- mp_srcptr up;
- mp_size_t size;
- mp_limb_t vlimb;
-#endif
{
mp_limb_t ulimb;
unsigned long int u_low_zero_bits, v_low_zero_bits;
diff --git a/mpn/generic/gcdext.c b/mpn/generic/gcdext.c
index 68b501ebb..06e31432c 100644
--- a/mpn/generic/gcdext.c
+++ b/mpn/generic/gcdext.c
@@ -1,6 +1,6 @@
/* mpn_gcdext -- Extended Greatest Common Divisor.
-Copyright 1996, 1998, 2000 Free Software Foundation, Inc.
+Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -71,16 +71,7 @@ int arr[BITS_PER_MP_LIMB];
/* Division optimized for small quotients. If the quotient is more than one limb,
store 1 in *qh and return 0. */
static mp_limb_t
-#if __STDC__
div2 (mp_limb_t *qh, mp_limb_t n1, mp_limb_t n0, mp_limb_t d1, mp_limb_t d0)
-#else
-div2 (qh, n1, n0, d1, d0)
- mp_limb_t *qh;
- mp_limb_t n1;
- mp_limb_t n0;
- mp_limb_t d1;
- mp_limb_t d0;
-#endif
{
if (d1 == 0)
{
@@ -146,31 +137,11 @@ div2 (qh, n1, n0, d1, d0)
mp_size_t
#if EXTEND
-#if __STDC__
mpn_gcdext (mp_ptr gp, mp_ptr s0p, mp_size_t *s0size,
mp_ptr up, mp_size_t size, mp_ptr vp, mp_size_t vsize)
#else
-mpn_gcdext (gp, s0p, s0size, up, size, vp, vsize)
- mp_ptr gp;
- mp_ptr s0p;
- mp_size_t *s0size;
- mp_ptr up;
- mp_size_t size;
- mp_ptr vp;
- mp_size_t vsize;
-#endif
-#else
-#if __STDC__
mpn_gcd (mp_ptr gp,
mp_ptr up, mp_size_t size, mp_ptr vp, mp_size_t vsize)
-#else
-mpn_gcd (gp, up, size, vp, vsize)
- mp_ptr gp;
- mp_ptr up;
- mp_size_t size;
- mp_ptr vp;
- mp_size_t vsize;
-#endif
#endif
{
mp_limb_t A, B, C, D;
diff --git a/mpn/generic/get_str.c b/mpn/generic/get_str.c
index a32700add..e72dbff03 100644
--- a/mpn/generic/get_str.c
+++ b/mpn/generic/get_str.c
@@ -1,7 +1,7 @@
/* mpn_get_str -- Convert a MSIZE long limb vector pointed to by MPTR
to a printable string in STR in base BASE.
-Copyright 1991, 1992, 1993, 1994, 1996, 2000 Free Software Foundation,
+Copyright 1991, 1992, 1993, 1994, 1996, 2000, 2001 Free Software Foundation,
Inc.
This file is part of the GNU MP Library.
@@ -40,15 +40,7 @@ MA 02111-1307, USA. */
The limb vector pointed to by MPTR is clobbered. */
size_t
-#if __STDC__
mpn_get_str (unsigned char *str, int base, mp_ptr mptr, mp_size_t msize)
-#else
-mpn_get_str (str, base, mptr, msize)
- unsigned char *str;
- int base;
- mp_ptr mptr;
- mp_size_t msize;
-#endif
{
mp_limb_t big_base;
#if UDIV_NEEDS_NORMALIZATION || UDIV_TIME > 2 * UMUL_TIME
diff --git a/mpn/generic/jacbase.c b/mpn/generic/jacbase.c
index 04e962617..bb41dd3ed 100644
--- a/mpn/generic/jacbase.c
+++ b/mpn/generic/jacbase.c
@@ -4,7 +4,7 @@
INCOMPATIBLE CHANGES IN A FUTURE RELEASE OF GMP. */
/*
-Copyright 1999, 2000 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -89,14 +89,7 @@ MA 02111-1307, USA. */
relaxed. All the places this is used currently call with a<=b though. */
int
-#if __STDC__
mpn_jacobi_base (mp_limb_t a, mp_limb_t b, int result_bit1)
-#else
-mpn_jacobi_base (a, b, result_bit1)
- mp_limb_t a;
- mp_limb_t b;
- int result_bit1;
-#endif
{
ASSERT (b & 1); /* b odd */
ASSERT (b != 1);
diff --git a/mpn/generic/lshift.c b/mpn/generic/lshift.c
index 8be101290..92b7fab3a 100644
--- a/mpn/generic/lshift.c
+++ b/mpn/generic/lshift.c
@@ -1,6 +1,6 @@
/* mpn_lshift -- Shift left low level.
-Copyright 1991, 1993, 1994, 1996, 2000 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -32,17 +32,9 @@ MA 02111-1307, USA. */
*/
mp_limb_t
-#if __STDC__
mpn_lshift (register mp_ptr wp,
register mp_srcptr up, mp_size_t usize,
register unsigned int cnt)
-#else
-mpn_lshift (wp, up, usize, cnt)
- register mp_ptr wp;
- register mp_srcptr up;
- mp_size_t usize;
- register unsigned int cnt;
-#endif
{
register mp_limb_t high_limb, low_limb;
register unsigned sh_1, sh_2;
@@ -55,19 +47,6 @@ mpn_lshift (wp, up, usize, cnt)
ASSERT (MPN_SAME_OR_DECR_P (wp, up, usize));
sh_1 = cnt;
-#if 0
- if (sh_1 == 0)
- {
- if (wp != up)
- {
- /* Copy from high end to low end, to allow specified input/output
- overlapping. */
- for (i = usize - 1; i >= 0; i--)
- wp[i] = up[i];
- }
- return 0;
- }
-#endif
wp += 1;
sh_2 = BITS_PER_MP_LIMB - sh_1;
diff --git a/mpn/generic/mod_1_rs.c b/mpn/generic/mod_1_rs.c
index e070fe54a..9a2384058 100644
--- a/mpn/generic/mod_1_rs.c
+++ b/mpn/generic/mod_1_rs.c
@@ -6,7 +6,7 @@
RELEASE. */
/*
-Copyright 1999, 2000 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -46,16 +46,8 @@ MA 02111-1307, USA. */
mpn_mod_1. */
mp_limb_t
-#if __STDC__
mpn_mod_1_rshift (mp_srcptr ptr, mp_size_t size, unsigned shift,
mp_limb_t divisor)
-#else
-mpn_mod_1_rshift (ptr, size, shift, divisor)
- mp_srcptr ptr;
- mp_size_t size;
- unsigned shift;
- mp_limb_t divisor;
-#endif
{
mp_limb_t quot, rem;
diff --git a/mpn/generic/mul_basecase.c b/mpn/generic/mul_basecase.c
index ed946cff5..3f14b808d 100644
--- a/mpn/generic/mul_basecase.c
+++ b/mpn/generic/mul_basecase.c
@@ -5,7 +5,7 @@
SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
-Copyright 1991, 1992, 1993, 1994, 1996, 1997, 2000 Free Software
+Copyright 1991, 1992, 1993, 1994, 1996, 1997, 2000, 2001 Free Software
Foundation, Inc.
This file is part of the GNU MP Library.
@@ -35,18 +35,9 @@ MA 02111-1307, USA. */
arrive here as this is the base case for Karatsuba's recursive algorithm. */
void
-#if __STDC__
mpn_mul_basecase (mp_ptr prodp,
mp_srcptr up, mp_size_t usize,
mp_srcptr vp, mp_size_t vsize)
-#else
-mpn_mul_basecase (prodp, up, usize, vp, vsize)
- mp_ptr prodp;
- mp_srcptr up;
- mp_size_t usize;
- mp_srcptr vp;
- mp_size_t vsize;
-#endif
{
ASSERT (usize >= vsize);
ASSERT (vsize >= 1);
diff --git a/mpn/generic/perfsqr.c b/mpn/generic/perfsqr.c
index 0c438896c..0e0255392 100644
--- a/mpn/generic/perfsqr.c
+++ b/mpn/generic/perfsqr.c
@@ -1,7 +1,7 @@
/* mpn_perfect_square_p(u,usize) -- Return non-zero if U is a perfect square,
zero otherwise.
-Copyright 1991, 1993, 1994, 1996, 1997, 2000 Free Software Foundation,
+Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001 Free Software Foundation,
Inc.
This file is part of the GNU MP Library.
@@ -42,13 +42,7 @@ static unsigned char const sq_res_0x100[0x100] =
};
int
-#if __STDC__
mpn_perfect_square_p (mp_srcptr up, mp_size_t usize)
-#else
-mpn_perfect_square_p (up, usize)
- mp_srcptr up;
- mp_size_t usize;
-#endif
{
mp_limb_t rem;
mp_ptr root_ptr;
diff --git a/mpn/generic/popham.c b/mpn/generic/popham.c
index b85d54f84..50ec634e3 100644
--- a/mpn/generic/popham.c
+++ b/mpn/generic/popham.c
@@ -1,6 +1,6 @@
/* mpn_popcount, mpn_hamdist -- population count and hamming distance.
-Copyright 1994, 1996, 2000 Free Software Foundation, Inc.
+Copyright 1994, 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -60,12 +60,7 @@ Error, need OPERATION_popcount or OPERATION_hamdist
You have to figure out how this works, I won't tell you! */
static inline unsigned int
-#if __STDC__
popc_limb (mp_limb_t x)
-#else
-popc_limb (x)
- mp_limb_t x;
-#endif
{
/* These constants could also be expressed as:
0xAA... = [2^(N+1) / 3] = [(2^N-1)/3*2]
diff --git a/mpn/generic/pre_mod_1.c b/mpn/generic/pre_mod_1.c
index 703d2f98a..e788d75a8 100644
--- a/mpn/generic/pre_mod_1.c
+++ b/mpn/generic/pre_mod_1.c
@@ -5,7 +5,7 @@
- 2^BITS_PER_MP_LIMB.
Return the single-limb remainder.
-Copyright 1991, 1993, 1994, 2000 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -30,16 +30,8 @@ MA 02111-1307, USA. */
mp_limb_t
-#if __STDC__
mpn_preinv_mod_1 (mp_srcptr dividend_ptr, mp_size_t dividend_size,
mp_limb_t divisor_limb, mp_limb_t divisor_limb_inverted)
-#else
-mpn_preinv_mod_1 (dividend_ptr, dividend_size, divisor_limb, divisor_limb_inverted)
- mp_srcptr dividend_ptr;
- mp_size_t dividend_size;
- mp_limb_t divisor_limb;
- mp_limb_t divisor_limb_inverted;
-#endif
{
mp_size_t i;
mp_limb_t n0, r;
diff --git a/mpn/generic/random.c b/mpn/generic/random.c
index 0cf4ec1e9..2705b9be1 100644
--- a/mpn/generic/random.c
+++ b/mpn/generic/random.c
@@ -1,6 +1,6 @@
/* mpn_random -- Generate random numbers.
-Copyright 1996, 1997, 2000 Free Software Foundation, Inc.
+Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -24,13 +24,7 @@ MA 02111-1307, USA. */
#include "urandom.h"
void
-#if __STDC__
mpn_random (mp_ptr res_ptr, mp_size_t size)
-#else
-mpn_random (res_ptr, size)
- mp_ptr res_ptr;
- mp_size_t size;
-#endif
{
mp_size_t i;
diff --git a/mpn/generic/random2.c b/mpn/generic/random2.c
index 577eda1bf..a37415754 100644
--- a/mpn/generic/random2.c
+++ b/mpn/generic/random2.c
@@ -1,7 +1,7 @@
/* mpn_random2 -- Generate random numbers with relatively long strings
of ones and zeroes. Suitable for border testing.
-Copyright 1992, 1993, 1994, 1996, 2000 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -41,13 +41,7 @@ long random ();
made the most significant bit set. */
void
-#if __STDC__
mpn_random2 (mp_ptr res_ptr, mp_size_t size)
-#else
-mpn_random2 (res_ptr, size)
- mp_ptr res_ptr;
- mp_size_t size;
-#endif
{
int n_bits;
int bit_pos;
diff --git a/mpn/generic/rshift.c b/mpn/generic/rshift.c
index 6588f868d..e3667244d 100644
--- a/mpn/generic/rshift.c
+++ b/mpn/generic/rshift.c
@@ -1,6 +1,6 @@
/* mpn_rshift -- Shift right a low-level natural-number integer.
-Copyright 1991, 1993, 1994, 1996, 2000 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -32,17 +32,9 @@ MA 02111-1307, USA. */
*/
mp_limb_t
-#if __STDC__
mpn_rshift (register mp_ptr wp,
register mp_srcptr up, mp_size_t usize,
register unsigned int cnt)
-#else
-mpn_rshift (wp, up, usize, cnt)
- register mp_ptr wp;
- register mp_srcptr up;
- mp_size_t usize;
- register unsigned int cnt;
-#endif
{
register mp_limb_t high_limb, low_limb;
register unsigned sh_1, sh_2;
@@ -56,20 +48,6 @@ mpn_rshift (wp, up, usize, cnt)
sh_1 = cnt;
-#if 0
- if (sh_1 == 0)
- {
- if (wp != up)
- {
- /* Copy from low end to high end, to allow specified input/output
- overlapping. */
- for (i = 0; i < usize; i++)
- wp[i] = up[i];
- }
- return usize;
- }
-#endif
-
wp -= 1;
sh_2 = BITS_PER_MP_LIMB - sh_1;
high_limb = up[0];
diff --git a/mpn/generic/sb_divrem_mn.c b/mpn/generic/sb_divrem_mn.c
index daa6a8558..2638f49d1 100644
--- a/mpn/generic/sb_divrem_mn.c
+++ b/mpn/generic/sb_divrem_mn.c
@@ -7,7 +7,7 @@
FUTURE GNU MP RELEASE.
-Copyright 1993, 1994, 1995, 1996, 2000 Free Software Foundation, Inc.
+Copyright 1993, 1994, 1995, 1996, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -52,18 +52,9 @@ MA 02111-1307, USA. */
mp_limb_t
-#if __STDC__
mpn_sb_divrem_mn (mp_ptr qp,
mp_ptr np, mp_size_t nsize,
mp_srcptr dp, mp_size_t dsize)
-#else
-mpn_sb_divrem_mn (qp, np, nsize, dp, dsize)
- mp_ptr qp;
- mp_ptr np;
- mp_size_t nsize;
- mp_srcptr dp;
- mp_size_t dsize;
-#endif
{
mp_limb_t most_significant_q_limb = 0;
mp_size_t i;
diff --git a/mpn/generic/scan0.c b/mpn/generic/scan0.c
index 4bb9d8384..bd024e5b6 100644
--- a/mpn/generic/scan0.c
+++ b/mpn/generic/scan0.c
@@ -1,6 +1,6 @@
/* mpn_scan0 -- Scan from a given bit position for the next clear bit.
-Copyright 1994, 1996 Free Software Foundation, Inc.
+Copyright 1994, 1996, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -32,14 +32,8 @@ MA 02111-1307, USA. */
*/
unsigned long int
-#if __STDC__
mpn_scan0 (register mp_srcptr up,
register unsigned long int starting_bit)
-#else
-mpn_scan0 (up, starting_bit)
- register mp_srcptr up;
- register unsigned long int starting_bit;
-#endif
{
mp_size_t starting_word;
mp_limb_t alimb;
diff --git a/mpn/generic/scan1.c b/mpn/generic/scan1.c
index f0ec37114..c6119c6d6 100644
--- a/mpn/generic/scan1.c
+++ b/mpn/generic/scan1.c
@@ -1,6 +1,6 @@
/* mpn_scan1 -- Scan from a given bit position for the next set bit.
-Copyright 1994, 1996 Free Software Foundation, Inc.
+Copyright 1994, 1996, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -32,14 +32,8 @@ MA 02111-1307, USA. */
*/
unsigned long int
-#if __STDC__
mpn_scan1 (register mp_srcptr up,
register unsigned long int starting_bit)
-#else
-mpn_scan1 (up, starting_bit)
- register mp_srcptr up;
- register unsigned long int starting_bit;
-#endif
{
mp_size_t starting_word;
mp_limb_t alimb;
diff --git a/mpn/generic/set_str.c b/mpn/generic/set_str.c
index 26885a04a..0c1c84680 100644
--- a/mpn/generic/set_str.c
+++ b/mpn/generic/set_str.c
@@ -3,7 +3,7 @@
limb vector pointed to by RES_PTR. Return the number of limbs in
RES_PTR.
-Copyright 1991, 1992, 1993, 1994, 1996, 2000 Free Software Foundation,
+Copyright 1991, 1992, 1993, 1994, 1996, 2000, 2001 Free Software Foundation,
Inc.
This file is part of the GNU MP Library.
@@ -27,15 +27,7 @@ MA 02111-1307, USA. */
#include "gmp-impl.h"
mp_size_t
-#if __STDC__
mpn_set_str (mp_ptr xp, const unsigned char *str, size_t str_len, int base)
-#else
-mpn_set_str (xp, str, str_len, base)
- mp_ptr xp;
- const unsigned char *str;
- size_t str_len;
- int base;
-#endif
{
mp_size_t size;
mp_limb_t big_base;
diff --git a/mpn/generic/sqr_basecase.c b/mpn/generic/sqr_basecase.c
index d2d413b6c..9ab7d78d4 100644
--- a/mpn/generic/sqr_basecase.c
+++ b/mpn/generic/sqr_basecase.c
@@ -5,7 +5,7 @@
SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
-Copyright 1991, 1992, 1993, 1994, 1996, 1997, 2000 Free Software
+Copyright 1991, 1992, 1993, 1994, 1996, 1997, 2000, 2001 Free Software
Foundation, Inc.
This file is part of the GNU MP Library.
@@ -30,14 +30,7 @@ MA 02111-1307, USA. */
#include "longlong.h"
void
-#if __STDC__
mpn_sqr_basecase (mp_ptr prodp, mp_srcptr up, mp_size_t n)
-#else
-mpn_sqr_basecase (prodp, up, n)
- mp_ptr prodp;
- mp_srcptr up;
- mp_size_t n;
-#endif
{
mp_size_t i;
diff --git a/mpn/generic/tdiv_qr.c b/mpn/generic/tdiv_qr.c
index 11437b475..ac9d480bc 100644
--- a/mpn/generic/tdiv_qr.c
+++ b/mpn/generic/tdiv_qr.c
@@ -12,7 +12,7 @@
The time complexity of this is O(qn*qn+M(dn,qn)), where M(m,n) is the time
complexity of multiplication.
-Copyright 1997, 2000 Free Software Foundation, Inc.
+Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU MP Library.
@@ -41,19 +41,8 @@ MA 02111-1307, USA. */
((h << cnt) | ((l >> 1) >> ((~cnt) & (BITS_PER_MP_LIMB - 1))))
void
-#if __STDC__
mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
mp_srcptr np, mp_size_t nn, mp_srcptr dp, mp_size_t dn)
-#else
-mpn_tdiv_qr (qp, rp, qxn, np, nn, dp, dn)
- mp_ptr qp;
- mp_ptr rp;
- mp_size_t qxn;
- mp_srcptr np;
- mp_size_t nn;
- mp_srcptr dp;
- mp_size_t dn;
-#endif
{
/* FIXME:
1. qxn