diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-13 22:12:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-13 22:12:32 (GMT) |
| commit | 89e6e17872e245d31d1d294fa72930cc3da79b81 (patch) | |
| tree | 34e403aa3d62a1000f4c99e69dcd662a5313ea68 /generic/tclTomMathDecls.h | |
| parent | e43882908292c514bc01b2ca0c63ce6d0611c692 (diff) | |
| parent | de326e5c5ed447c99c7be6991f76cc9d5e774698 (diff) | |
| download | tcl-89e6e17872e245d31d1d294fa72930cc3da79b81.zip tcl-89e6e17872e245d31d1d294fa72930cc3da79b81.tar.gz tcl-89e6e17872e245d31d1d294fa72930cc3da79b81.tar.bz2 | |
Merge 8.7 and (hopefully) fix Travis build with C++
Diffstat (limited to 'generic/tclTomMathDecls.h')
| -rw-r--r-- | generic/tclTomMathDecls.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h index f199a2a..736a640 100644 --- a/generic/tclTomMathDecls.h +++ b/generic/tclTomMathDecls.h @@ -56,6 +56,9 @@ # define MODULE_SCOPE extern #endif +#ifdef __cplusplus +extern "C" { +#endif MODULE_SCOPE mp_err TclBN_s_mp_add_d(const mp_int *a, mp_digit b, mp_int *c); MODULE_SCOPE mp_ord TclBN_s_mp_cmp_d(const mp_int *a, mp_digit b); MODULE_SCOPE mp_err TclBN_s_mp_div_d(const mp_int *a, mp_digit b, mp_int *c, mp_digit *d); @@ -66,7 +69,9 @@ MODULE_SCOPE mp_err TclBN_s_mp_mul_d(const mp_int *a, mp_digit b, mp_int *c); MODULE_SCOPE void TclBN_s_mp_reverse(unsigned char *s, size_t len); MODULE_SCOPE void TclBN_s_mp_set(mp_int *a, mp_digit b); MODULE_SCOPE mp_err TclBN_s_mp_sub_d(const mp_int *a, mp_digit b, mp_int *c); - +#ifdef __cplusplus +} +#endif /* Rename the global symbols in libtommath to avoid linkage conflicts */ @@ -740,6 +745,9 @@ extern const TclTomMathStubs *tclTomMathStubsPtr; #undef mp_isodd #define mp_iseven(a) (!mp_isodd(a)) #define mp_isodd(a) (((a)->used != 0 && (((a)->dp[0] & 1) != 0)) ? MP_YES : MP_NO) +#undef mp_sqr +#define mp_sqr(a,b) mp_mul(a,a,b) + #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT |