Clean out __GMP_PROTO.

3 files changed, 16 insertions, 19 deletions

diff --git a/mini-gmp/mini-gmp.c b/mini-gmp/mini-gmp.c
index a9e731e3e..538ec2ab5 100644
--- a/mini-gmp/mini-gmp.c
+++ b/mini-gmp/mini-gmp.c
@@ -3134,7 +3134,8 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
   mpz_clear (base);
 }
 
-void mpz_powm_ui (mpz_t r, const mpz_t b, unsigned long elimb, const mpz_t m)
+void
+mpz_powm_ui (mpz_t r, const mpz_t b, unsigned long elimb, const mpz_t m)
 {
   mpz_t e;
   mpz_init_set_ui (e, elimb);
diff --git a/mini-gmp/mini-gmp.h b/mini-gmp/mini-gmp.h
index 927784c5d..87f37beff 100644
--- a/mini-gmp/mini-gmp.h
+++ b/mini-gmp/mini-gmp.h
@@ -77,13 +77,13 @@ mp_limb_t mpn_sub_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
 mp_limb_t mpn_sub_n (mp_ptr, mp_srcptr, mp_srcptr, mp_size_t);
 mp_limb_t mpn_sub (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
 
-mp_limb_t mpn_mul_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b);
-mp_limb_t mpn_addmul_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b);
-mp_limb_t mpn_submul_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b);
+mp_limb_t mpn_mul_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
+mp_limb_t mpn_addmul_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
+mp_limb_t mpn_submul_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
 
-mp_limb_t mpn_mul (mp_ptr rp, mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn);
-void mpn_mul_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n);
-void mpn_sqr (mp_ptr rp, mp_srcptr ap, mp_size_t n);
+mp_limb_t mpn_mul (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
+void mpn_mul_n (mp_ptr, mp_srcptr, mp_srcptr, mp_size_t);
+void mpn_sqr (mp_ptr, mp_srcptr, mp_size_t);
 
 mp_limb_t mpn_lshift (mp_ptr, mp_srcptr, mp_size_t, unsigned int);
 mp_limb_t mpn_rshift (mp_ptr, mp_srcptr, mp_size_t, unsigned int);
@@ -141,7 +141,7 @@ void mpz_cdiv_r_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
 void mpz_fdiv_r_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
 void mpz_tdiv_r_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
 
-void mpz_divexact (mpz_t q, const mpz_t n, const mpz_t d);
+void mpz_divexact (mpz_t, const mpz_t, const mpz_t);
 
 int mpz_divisible_p (const mpz_t, const mpz_t);
 
@@ -158,7 +158,7 @@ unsigned long mpz_cdiv_ui (const mpz_t, unsigned long);
 unsigned long mpz_fdiv_ui (const mpz_t, unsigned long);
 unsigned long mpz_tdiv_ui (const mpz_t, unsigned long);
 
-void mpz_divexact_ui (mpz_t q, const mpz_t n, unsigned long d);
+void mpz_divexact_ui (mpz_t, const mpz_t, unsigned long);
 
 int mpz_divisible_ui_p (const mpz_t, unsigned long);
 
diff --git a/mini-gmp/tests/mini-random.h b/mini-gmp/tests/mini-random.h
index 407d7b516..38c9af4e7 100644
--- a/mini-gmp/tests/mini-random.h
+++ b/mini-gmp/tests/mini-random.h
@@ -20,13 +20,9 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "mini-gmp.h"
 #include "hex-random.h"
 
-void mini_urandomb (mpz_t r, unsigned long bits);
-void mini_rrandomb (mpz_t r, unsigned long bits);
-void mini_random_op (enum hex_random_op op,  unsigned long maxbits,
-		     mpz_t a, mpz_t b, mpz_t r);
-void mini_random_op4 (enum hex_random_op op, unsigned long maxbits,
-		      mpz_t a, mpz_t b, mpz_t c, mpz_t e);
-void mini_random_scan_op (enum hex_random_op op, unsigned long maxbits,
-			  mpz_t a, mp_bitcnt_t *b, mp_bitcnt_t *r);
-void mini_random_bit_op (enum hex_random_op op, unsigned long maxbits,
-			 mpz_t a, mp_bitcnt_t *b, mpz_t r);
+void mini_urandomb (mpz_t, unsigned long);
+void mini_rrandomb (mpz_t, unsigned long);
+void mini_random_op (enum hex_random_op,  unsigned long, mpz_t, mpz_t, mpz_t);
+void mini_random_op4 (enum hex_random_op, unsigned long, mpz_t, mpz_t, mpz_t, mpz_t);
+void mini_random_scan_op (enum hex_random_op, unsigned long, mpz_t, mp_bitcnt_t *, mp_bitcnt_t *);
+void mini_random_bit_op (enum hex_random_op, unsigned long, mpz_t, mp_bitcnt_t *, mpz_t);