More code cleanup related to libtommath 1.2.0: Adapt naming of (internal) symbols to new conventions. Remove deprecated declarations which were never implemented/included by Tcl.

1 files changed, 0 insertions, 25 deletions

diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index 9afa10f..618e555 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -41,7 +41,6 @@ extern "C" {
 /* some default configurations.
  *
  * A "mp_digit" must be able to hold MP_DIGIT_BIT + 1 bits
- * A "mp_word" must be able to hold 2*MP_DIGIT_BIT + 1 bits
  *
  * At the very least a mp_digit must be able to hold 7 bits
  * [any size beyond that is ok provided it doesn't overflow the data type]
@@ -52,7 +51,6 @@ extern "C" {
 typedef unsigned char        mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-typedef unsigned short       mp_word;
 #   define MP_SIZEOF_MP_DIGIT 1
 #   ifdef MP_DIGIT_BIT
 #      error You must not define MP_DIGIT_BIT when using MP_8BIT
@@ -62,7 +60,6 @@ typedef unsigned short       mp_word;
 typedef unsigned short       mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-typedef unsigned int         mp_word;
 #   define MP_SIZEOF_MP_DIGIT 2
 #   ifdef MP_DIGIT_BIT
 #      error You must not define MP_DIGIT_BIT when using MP_16BIT
@@ -73,7 +70,6 @@ typedef unsigned int         mp_word;
 typedef unsigned long long   mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-typedef unsigned long        mp_word __attribute__((mode(TI)));
 #   define MP_DIGIT_BIT 60
 #else
 /* this is the default case, 28-bit digits */
@@ -83,11 +79,6 @@ typedef unsigned long        mp_word __attribute__((mode(TI)));
 typedef unsigned int         mp_digit;
 #define MP_DIGIT_DECLARED
 #endif
-#ifdef _WIN32
-typedef unsigned __int64   mp_word;
-#else
-typedef unsigned long long   mp_word;
-#endif
 
 #   ifdef MP_31BIT
 /*
@@ -204,9 +195,6 @@ TOOM_SQR_CUTOFF;
 #   endif
 #endif
 
-/* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
-#define PRIVATE_MP_WARRAY (int)(1 << (((CHAR_BIT * sizeof(mp_word)) - (2 * MP_DIGIT_BIT)) + 1))
-
 #if defined(__GNUC__) && __GNUC__ >= 4
 #   define MP_NULL_TERMINATED __attribute__((sentinel))
 #else
@@ -264,10 +252,6 @@ struct mp_int {
    mp_digit *dp;
 };
 
-/* callback for mp_prime_random, should fill dst with random bytes and return how many read [upto len] */
-typedef int private_mp_prime_callback(unsigned char *dst, int len, void *dat);
-typedef private_mp_prime_callback MP_DEPRECATED(mp_rand_source) ltm_prime_callback;
-
 /* error code to char* string */
 /*
 const char *mp_error_to_string(mp_err code) MP_WUR;
@@ -896,11 +880,6 @@ mp_err mp_exptmod(const mp_int *G, const mp_int *X, const mp_int *P, mp_int *Y)
 #endif
 #define PRIME_SIZE (MP_DEPRECATED_PRAGMA("PRIME_SIZE has been made internal") PRIVATE_MP_PRIME_TAB_SIZE)
 
-/* table of first PRIME_SIZE primes */
-#if defined(BUILD_tcl) || !defined(_WIN32)
-MODULE_SCOPE const mp_digit ltm_prime_tab[PRIVATE_MP_PRIME_TAB_SIZE];
-#endif
-
 /* result=1 if a is divisible by one of the first PRIME_SIZE primes */
 /*
 MP_DEPRECATED(mp_prime_is_prime) mp_err mp_prime_is_divisible(const mp_int *a, mp_bool *result) MP_WUR;
@@ -993,10 +972,6 @@ mp_err mp_prime_next_prime(mp_int *a, int t, int bbs_style) MP_WUR;
  *
  */
 /*
-MP_DEPRECATED(mp_prime_rand) mp_err mp_prime_random_ex(mp_int *a, int t, int size, int flags,
-      private_mp_prime_callback cb, void *dat) MP_WUR;
-*/
-/*
 mp_err mp_prime_rand(mp_int *a, int t, int size, int flags) MP_WUR;
 */