Merge 8.6

3 files changed, 16 insertions, 24 deletions

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 3d6439f..ccffa78 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -533,8 +533,6 @@ tellOld(
 #define Tcl_WinTCharToUtf 0
 #endif
 
-#undef TclBN_mp_unsigned_bin_size
-#define TclBN_mp_unsigned_bin_size (int (*)(const mp_int *a)) mp_ubin_size
 
 /*
  * WARNING: The contents of this file is automatically generated by the
@@ -987,7 +985,7 @@ const TclTomMathStubs tclTomMathStubs = {
     TclBN_mp_to_unsigned_bin, /* 44 */
     TclBN_mp_to_unsigned_bin_n, /* 45 */
     TclBN_mp_toradix_n, /* 46 */
-    TclBN_mp_unsigned_bin_size, /* 47 */
+    TclBN_mp_ubin_size, /* 47 */
     TclBN_mp_xor, /* 48 */
     TclBN_mp_zero, /* 49 */
     TclBN_reverse, /* 50 */
@@ -1019,7 +1017,7 @@ const TclTomMathStubs tclTomMathStubs = {
     TclBN_mp_signed_rsh, /* 76 */
     TclBN_mp_get_bit, /* 77 */
     TclBN_mp_to_ubin, /* 78 */
-    TclBN_mp_ubin_size, /* 79 */
+    0, /* 79 */
     TclBN_mp_to_radix, /* 80 */
 };
 
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 9f7db14..b67263e 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -165,8 +165,8 @@ declare 45 {deprecated {Use mp_to_ubin}} {
 declare 46 {deprecated {Use mp_to_radix}} {
     mp_err TclBN_mp_toradix_n(const mp_int *a, char *str, int radix, int maxlen)
 }
-declare 47 {deprecated {Use mp_ubin_size}} {
-    int TclBN_mp_unsigned_bin_size(const mp_int *a)
+declare 47 {
+    size_t TclBN_mp_ubin_size(const mp_int *a)
 }
 declare 48 {
     mp_err MP_WUR TclBN_mp_xor(const mp_int *a, const mp_int *b, mp_int *c)
@@ -272,9 +272,6 @@ declare 77 {deprecated {is private function in libtommath}} {
 declare 78 {
     int MP_WUR TclBN_mp_to_ubin(const mp_int *a, unsigned char *buf, size_t maxlen, size_t *written)
 }
-declare 79 {
-    size_t MP_WUR TclBN_mp_ubin_size(const mp_int *a)
-}
 declare 80 {
     int MP_WUR TclBN_mp_to_radix(const mp_int *a, char *str, size_t maxlen, size_t *written, int radix)
 }
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 1460f1c..574ee86 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -89,7 +89,7 @@
 #define mp_init_copy TclBN_mp_init_copy
 #define mp_init_multi TclBN_mp_init_multi
 #define mp_init_set TclBN_mp_init_set
-#define mp_init_set_int(a,i) TclBN_mp_init_ul(a,(unsigned int)(i))
+#define mp_init_set_int(a,i) (MP_DEPRECATED_PRAGMA("replaced by mp_init_ul") TclBN_mp_init_ul(a,(unsigned int)(i)))
 #define mp_init_size TclBN_mp_init_size
 #define mp_init_ul TclBN_mp_init_ul
 #define mp_karatsuba_mul TclBN_mp_karatsuba_mul
@@ -110,9 +110,9 @@
 #define mp_read_radix TclBN_mp_read_radix
 #define mp_rshd TclBN_mp_rshd
 #define mp_set TclBN_mp_set
-#define mp_set_int(a,b) (TclBN_mp_set_ul((a),((unsigned int)(b))),MP_OKAY)
-#define mp_set_long(a,b) (TclBN_mp_set_ul((a),(b)),MP_OKAY)
-#define mp_set_long_long(a,b) (TclBN_mp_set_ull((a),(b)),MP_OKAY)
+#define mp_set_int(a,b) (MP_DEPRECATED_PRAGMA("replaced by mp_set_ul") (TclBN_mp_set_ul((a),((unsigned int)(b))),MP_OKAY))
+#define mp_set_long(a,b) (MP_DEPRECATED_PRAGMA("replaced by mp_set_ul") (TclBN_mp_set_ul((a),(b)),MP_OKAY))
+#define mp_set_long_long(a,b) (MP_DEPRECATED_PRAGMA("replaced by mp_set_ull") (TclBN_mp_set_ull((a),(b)),MP_OKAY))
 #define mp_set_ul TclBN_mp_set_ul
 #define mp_set_ull TclBN_mp_set_ull
 #define mp_shrink TclBN_mp_shrink
@@ -136,7 +136,7 @@
 #define mp_to_radix TclBN_mp_to_radix
 #define mp_to_ubin TclBN_mp_to_ubin
 #define mp_ubin_size TclBN_mp_ubin_size
-#define mp_unsigned_bin_size TclBN_mp_unsigned_bin_size
+#define mp_unsigned_bin_size(mp) (MP_DEPRECATED_PRAGMA("replaced by mp_ubin_size") (int)TclBN_mp_ubin_size(mp))
 #define mp_xor TclBN_mp_xor
 #define mp_zero TclBN_mp_zero
 #define s_mp_add TclBN_s_mp_add
@@ -288,8 +288,7 @@ TCL_DEPRECATED("Use mp_to_radix")
 mp_err			TclBN_mp_toradix_n(const mp_int *a, char *str,
 				int radix, int maxlen);
 /* 47 */
-TCL_DEPRECATED("Use mp_ubin_size")
-int			TclBN_mp_unsigned_bin_size(const mp_int *a);
+EXTERN size_t		TclBN_mp_ubin_size(const mp_int *a);
 /* 48 */
 EXTERN mp_err		TclBN_mp_xor(const mp_int *a, const mp_int *b,
 				mp_int *c) MP_WUR;
@@ -382,8 +381,7 @@ mp_bool			TclBN_mp_get_bit(const mp_int *a, unsigned int b);
 /* 78 */
 EXTERN int		TclBN_mp_to_ubin(const mp_int *a, unsigned char *buf,
 				size_t maxlen, size_t *written) MP_WUR;
-/* 79 */
-EXTERN size_t		TclBN_mp_ubin_size(const mp_int *a) MP_WUR;
+/* Slot 79 is reserved */
 /* 80 */
 EXTERN int		TclBN_mp_to_radix(const mp_int *a, char *str,
 				size_t maxlen, size_t *written, int radix) MP_WUR;
@@ -439,7 +437,7 @@ typedef struct TclTomMathStubs {
     TCL_DEPRECATED_API("Use mp_to_ubin") mp_err (*tclBN_mp_to_unsigned_bin) (const mp_int *a, unsigned char *b); /* 44 */
     TCL_DEPRECATED_API("Use mp_to_ubin") mp_err (*tclBN_mp_to_unsigned_bin_n) (const mp_int *a, unsigned char *b, unsigned long *outlen); /* 45 */
     TCL_DEPRECATED_API("Use mp_to_radix") mp_err (*tclBN_mp_toradix_n) (const mp_int *a, char *str, int radix, int maxlen); /* 46 */
-    TCL_DEPRECATED_API("Use mp_ubin_size") int (*tclBN_mp_unsigned_bin_size) (const mp_int *a); /* 47 */
+    size_t (*tclBN_mp_ubin_size) (const mp_int *a); /* 47 */
     mp_err (*tclBN_mp_xor) (const mp_int *a, const mp_int *b, mp_int *c) MP_WUR; /* 48 */
     void (*tclBN_mp_zero) (mp_int *a); /* 49 */
     TCL_DEPRECATED_API("is private function in libtommath") void (*tclBN_reverse) (unsigned char *s, int len); /* 50 */
@@ -471,7 +469,7 @@ typedef struct TclTomMathStubs {
     mp_err (*tclBN_mp_signed_rsh) (const mp_int *a, int b, mp_int *c) MP_WUR; /* 76 */
     TCL_DEPRECATED_API("is private function in libtommath") mp_bool (*tclBN_mp_get_bit) (const mp_int *a, unsigned int b); /* 77 */
     int (*tclBN_mp_to_ubin) (const mp_int *a, unsigned char *buf, size_t maxlen, size_t *written) MP_WUR; /* 78 */
-    size_t (*tclBN_mp_ubin_size) (const mp_int *a) MP_WUR; /* 79 */
+    void (*reserved79)(void);
     int (*tclBN_mp_to_radix) (const mp_int *a, char *str, size_t maxlen, size_t *written, int radix) MP_WUR; /* 80 */
 } TclTomMathStubs;
 
@@ -581,8 +579,8 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_to_unsigned_bin_n) /* 45 */
 #define TclBN_mp_toradix_n \
 	(tclTomMathStubsPtr->tclBN_mp_toradix_n) /* 46 */
-#define TclBN_mp_unsigned_bin_size \
-	(tclTomMathStubsPtr->tclBN_mp_unsigned_bin_size) /* 47 */
+#define TclBN_mp_ubin_size \
+	(tclTomMathStubsPtr->tclBN_mp_ubin_size) /* 47 */
 #define TclBN_mp_xor \
 	(tclTomMathStubsPtr->tclBN_mp_xor) /* 48 */
 #define TclBN_mp_zero \
@@ -644,8 +642,7 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_get_bit) /* 77 */
 #define TclBN_mp_to_ubin \
 	(tclTomMathStubsPtr->tclBN_mp_to_ubin) /* 78 */
-#define TclBN_mp_ubin_size \
-	(tclTomMathStubsPtr->tclBN_mp_ubin_size) /* 79 */
+/* Slot 79 is reserved */
 #define TclBN_mp_to_radix \
 	(tclTomMathStubsPtr->tclBN_mp_to_radix) /* 80 */