Misc changes, fixing name space issues and compiler warnings.

9 files changed, 22 insertions, 14 deletions

diff --git a/gmp-impl.h b/gmp-impl.h
index 27f302e5b..524787d88 100644
--- a/gmp-impl.h
+++ b/gmp-impl.h
@@ -1111,9 +1111,15 @@ void      mpn_toom3_sqr_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_ptr));
 #define   mpn_toom22_mul __MPN(toom22_mul)
 void      mpn_toom22_mul __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr));
 
+#define   mpn_toom2_sqr __MPN(toom2_sqr)
+void      mpn_toom2_sqr __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_ptr));
+
 #define   mpn_toom33_mul __MPN(toom33_mul)
 void      mpn_toom33_mul __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr));
 
+#define   mpn_toom3_sqr __MPN(toom3_sqr)
+void      mpn_toom3_sqr __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_ptr));
+
 #define   mpn_toom44_mul __MPN(toom44_mul)
 void      mpn_toom44_mul __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr));
 
@@ -1238,6 +1244,12 @@ void      mpn_powm __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_siz
 #define   mpn_powlo __MPN(powlo)
 void      mpn_powlo __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, mp_size_t, mp_ptr));
 
+#define   mpn_powm_sec __MPN(powm_sec)
+void      mpn_powm_sec __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr));
+#define   mpn_subcnd_n __MPN(subcnd_n)
+mp_limb_t mpn_subcnd_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, mp_limb_t));
+#define   mpn_tabselect __MPN(tabselect)
+void      mpn_tabselect __GMP_PROTO ((volatile mp_limb_t *, volatile mp_limb_t *, mp_size_t, mp_size_t, mp_size_t));
 
 #ifndef DIVEXACT_BY3_METHOD
 #if GMP_NUMB_BITS % 2 == 0 && ! defined (HAVE_NATIVE_mpn_divexact_by3c)
@@ -3539,12 +3551,12 @@ void __gmp_invalid_operation __GMP_PROTO ((void)) ATTRIBUTE_NORETURN;
   } while (0)
 
 /* Matrix multiplication */
-#define mpn_matrix22_mul __MPN(matrix22_mul)
+#define   mpn_matrix22_mul __MPN(matrix22_mul)
+void      mpn_matrix22_mul __GMP_PROTO ((mp_ptr, mp_ptr, mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_srcptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr));
+#define   mpn_matrix22_mul_strassen __MPN(matrix22_mul_strassen)
+void      mpn_matrix22_mul_strassen __GMP_PROTO ((mp_ptr, mp_ptr, mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_srcptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr));
+#define   mpn_matrix22_mul_itch __MPN(matrix22_mul_itch)
 mp_size_t mpn_matrix22_mul_itch __GMP_PROTO ((mp_size_t, mp_size_t));
-#define mpn_matrix22_mul_strassen __MPN(matrix22_mul_strassen)
-void mpn_matrix22_mul __GMP_PROTO ((mp_ptr, mp_ptr, mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_srcptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr));
-#define mpn_matrix22_mul_itch __MPN(matrix22_mul_itch)
-void mpn_matrix22_mul_strassen __GMP_PROTO ((mp_ptr, mp_ptr, mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_srcptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr));
 
 #ifndef MATRIX22_STRASSEN_THRESHOLD
 #define MATRIX22_STRASSEN_THRESHOLD 30
diff --git a/mpf/eq.c b/mpf/eq.c
index 432ae9483..9395b68dc 100644
--- a/mpf/eq.c
+++ b/mpf/eq.c
@@ -114,6 +114,6 @@ mpf_eq (mpf_srcptr u, mpf_srcptr v, unsigned long int n_bits)
 	return 0;
     }
 
-  diff = (up[0] ^ vp[0]) >> GMP_NUMB_BITS - 1 - (n_bits - 1) % GMP_NUMB_BITS;
+  diff = (up[0] ^ vp[0]) >> (GMP_NUMB_BITS - 1 - (n_bits - 1) % GMP_NUMB_BITS);
   return diff == 0;
 }
diff --git a/mpn/generic/get_d.c b/mpn/generic/get_d.c
index 66e8c7908..ea8a880e3 100644
--- a/mpn/generic/get_d.c
+++ b/mpn/generic/get_d.c
@@ -191,7 +191,7 @@ mpn_get_d (mp_srcptr up, mp_size_t size, mp_size_t sign, long exp)
 	  nbits += GMP_NUMB_BITS;
 	}
     }
-  mhi = m >> 32 + 11;
+  mhi = m >> (32 + 11);
   mlo = m >> 11;
 #endif
 #if GMP_LIMB_BITS == 32
diff --git a/mpn/generic/powm_sec.c b/mpn/generic/powm_sec.c
index ccf0e833e..7bbdd7e21 100644
--- a/mpn/generic/powm_sec.c
+++ b/mpn/generic/powm_sec.c
@@ -139,9 +139,6 @@ redcify (mp_ptr rp, mp_srcptr up, mp_size_t un, mp_srcptr mp, mp_size_t n)
   TMP_FREE;
 }
 
-void
-mpn_tabselect (volatile mp_limb_t *, volatile mp_limb_t *, mp_size_t, mp_size_t, mp_size_t);
-
 /* rp[n-1..0] = bp[bn-1..0] ^ ep[en-1..0] mod mp[n-1..0]
    Requires that mp[n-1..0] is odd.
    Requires that ep[en-1..0] is > 1.
diff --git a/mpn/generic/toom2_sqr.c b/mpn/generic/toom2_sqr.c
index 7ec0d0abd..445cff8f5 100644
--- a/mpn/generic/toom2_sqr.c
+++ b/mpn/generic/toom2_sqr.c
@@ -62,7 +62,6 @@ mpn_toom2_sqr (mp_ptr pp,
 	       mp_ptr scratch)
 {
   mp_size_t n, s;
-  int vm1_neg;
   mp_limb_t cy, cy2;
   mp_ptr asm1;
 
diff --git a/mpn/generic/toom4_sqr.c b/mpn/generic/toom4_sqr.c
index 0704c4858..13a2c6652 100644
--- a/mpn/generic/toom4_sqr.c
+++ b/mpn/generic/toom4_sqr.c
@@ -89,7 +89,6 @@ mpn_toom4_sqr (mp_ptr pp,
   mp_limb_t cy;
   mp_ptr gp, hp;
   mp_ptr as1, asm1, as2, ash, asmh;
-  enum toom4_flags flags;
   TMP_DECL;
 
 #define a0  ap
diff --git a/tests/mpn/t-hgcd.c b/tests/mpn/t-hgcd.c
index 2615fd679..f2e3692ff 100644
--- a/tests/mpn/t-hgcd.c
+++ b/tests/mpn/t-hgcd.c
@@ -88,7 +88,7 @@ main (int argc, char **argv)
 	  fprintf (stderr, "op1=");                 debug_mp (op1, -16);
 	  fprintf (stderr, "op2=");                 debug_mp (op2, -16);
 	  fprintf (stderr, "expected: %d\n", hgcd_values[i].res);
-	  fprintf (stderr, "hgcd:     %d\n", res);
+	  fprintf (stderr, "hgcd:     %d\n", (int) res);
 	  abort ();
 	}
     }
diff --git a/tests/mpz/t-nextprime.c b/tests/mpz/t-nextprime.c
index d97001a93..1734f6149 100644
--- a/tests/mpz/t-nextprime.c
+++ b/tests/mpz/t-nextprime.c
@@ -79,7 +79,7 @@ main (int argc, char **argv)
   int reps = 20;
   gmp_randstate_ptr rands;
   mpz_t bs, x, nxtp, ref_nxtp;
-  unsigned long bsi, size_range;
+  unsigned long size_range;
 
   tests_start();
   rands = RANDS;
diff --git a/tests/mpz/t-perfpow.c b/tests/mpz/t-perfpow.c
index 101aec1d2..aebe1b57b 100644
--- a/tests/mpz/t-perfpow.c
+++ b/tests/mpz/t-perfpow.c
@@ -100,6 +100,7 @@ check_tests ()
   mpz_clear (x);
 }
 
+void
 check_random (int n_tests)
 {
   int test;