summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-24 13:06:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-24 13:06:07 (GMT)
commitbc0d60d931ae4b37a77de366f73addd1af213fb9 (patch)
treeaa933341e9c1e2e00b1014456ef3b583fe457430
parent7e63083ea10c94a9a905807f6f457820303f787f (diff)
parentd134d35fef774db63654e487bb6303b79597b820 (diff)
downloadtcl-bc0d60d931ae4b37a77de366f73addd1af213fb9.zip
tcl-bc0d60d931ae4b37a77de366f73addd1af213fb9.tar.gz
tcl-bc0d60d931ae4b37a77de366f73addd1af213fb9.tar.bz2
Merge 8.7. Fix "make checkstubs"
-rw-r--r--generic/tcl.decls3
-rw-r--r--generic/tclStubInit.c3
-rw-r--r--generic/tclTomMathDecls.h16
-rw-r--r--generic/tclZipfs.c6
4 files changed, 23 insertions, 5 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 2ce6ae2..61a71bd 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2544,6 +2544,9 @@ export {
export {
void Tcl_InitSubsystems(void)
}
+export {
+ int TclZipfs_AppHook(int *argc, char ***argv)
+}
# Local Variables:
# mode: tcl
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 51e62fc..2248238 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -114,7 +114,6 @@ static void uniCodePanic() {
#define TclBN_mp_neg mp_neg
#define TclBN_mp_or mp_or
#define TclBN_mp_radix_size mp_radix_size
-#define TclBN_mp_reverse mp_reverse
#define TclBN_mp_read_radix mp_read_radix
#define TclBN_mp_rshd mp_rshd
#define TclBN_mp_set_i64 mp_set_i64
@@ -132,7 +131,7 @@ static void uniCodePanic() {
#define TclBN_mp_xor mp_xor
#define TclBN_mp_zero mp_zero
#define TclBN_s_mp_add s_mp_add
-#define TclBN_s_mp_balance_mul mp_balance_mul
+#define TclBN_mp_balance_mul s_mp_balance_mul
#define TclBN_mp_karatsuba_mul s_mp_karatsuba_mul
#define TclBN_mp_karatsuba_sqr s_mp_karatsuba_sqr
#define TclBN_s_mp_mul_digs s_mp_mul_digs
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 4e259c7..a01446b 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -65,6 +65,22 @@ extern "C" {
#endif
MODULE_SCOPE mp_err TclBN_mp_sqr(const mp_int *a, mp_int *b);
MODULE_SCOPE mp_err TclBN_mp_div_3(const mp_int *a, mp_int *q, mp_digit *r);
+MODULE_SCOPE mp_err TclBN_mp_balance_mul(const mp_int *a, const mp_int *b, mp_int *c);
+MODULE_SCOPE mp_err TclBN_mp_karatsuba_mul(const mp_int *a, const mp_int *b, mp_int *c);
+MODULE_SCOPE mp_err TclBN_mp_karatsuba_sqr(const mp_int *a, mp_int *b);
+MODULE_SCOPE mp_err TclBN_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c);
+MODULE_SCOPE mp_err TclBN_mp_toom_sqr(const mp_int *a, mp_int *b);
+MODULE_SCOPE mp_err TclBN_s_mp_add(const mp_int *a, const mp_int *b, mp_int *c);
+MODULE_SCOPE mp_err TclBN_s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs);
+MODULE_SCOPE mp_err TclBN_s_mp_mul_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int digs);
+MODULE_SCOPE void TclBN_s_mp_reverse(unsigned char *s, size_t len);
+MODULE_SCOPE mp_err TclBN_s_mp_sqr(const mp_int *a, mp_int *b);
+MODULE_SCOPE mp_err TclBN_s_mp_sqr_fast(const mp_int *a, mp_int *b);
+MODULE_SCOPE mp_err TclBN_s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c);
+MODULE_SCOPE const char *const TclBN_mp_s_rmap;
+MODULE_SCOPE const uint8_t TclBN_mp_s_rmap_reverse[];
+MODULE_SCOPE const size_t TclBN_mp_s_rmap_reverse_sz;
+MODULE_SCOPE mp_err TclBN_mp_set_int(mp_int *a, unsigned long b);
#ifdef __cplusplus
}
#endif
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 9c94851..dfc52bb 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -2,7 +2,7 @@
* tclZipfs.c --
*
* Implementation of the ZIP filesystem used in TIP 430
- * Adapted from the implentation for AndroWish.
+ * Adapted from the implementation for AndroWish.
*
* Copyright © 2016-2017 Sean Woods <yoda@etoyoc.com>
* Copyright © 2013-2015 Christian Werner <chw@ch-werner.de>
@@ -4788,14 +4788,14 @@ TclZipfs_AppHook(
char ***argvPtr) /* Pointer to argv */
#endif /* _WIN32 */
{
- char *archive;
+ const char *archive;
#ifdef _WIN32
Tcl_FindExecutable(NULL);
#else
Tcl_FindExecutable((*argvPtr)[0]);
#endif
- archive = (char *) Tcl_GetNameOfExecutable();
+ archive = Tcl_GetNameOfExecutable();
TclZipfs_Init(NULL);
/*