diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-30 09:20:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-30 09:20:33 (GMT) |
| commit | d06eced64d56c982bf9a1995e41464cdfb81a269 (patch) | |
| tree | 76d71a4218831b2ea44336a2ea0cc0c50c705fec | |
| parent | 92428a104566e8fd27504903c00fd84a18d12be4 (diff) | |
| download | tcl-d06eced64d56c982bf9a1995e41464cdfb81a269.zip tcl-d06eced64d56c982bf9a1995e41464cdfb81a269.tar.gz tcl-d06eced64d56c982bf9a1995e41464cdfb81a269.tar.bz2 | |
More tweaks, hopefully fixing the Travis build
| -rw-r--r-- | generic/tclTomMathDecls.h | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h index 3c44bc9..effd3b7 100644 --- a/generic/tclTomMathDecls.h +++ b/generic/tclTomMathDecls.h @@ -62,16 +62,6 @@ MODULE_SCOPE mp_err TclBN_s_mp_expt_u32(const mp_int *a, unsigned int b, mp_int /* Rename the global symbols in libtommath to avoid linkage conflicts */ -#define mp_add_d TclBN_s_mp_add_d -#define mp_cmp_d TclBN_s_mp_cmp_d -#define mp_div_d TclBN_s_mp_div_d -#define mp_div_3 TclBN_s_mp_div_3 -#define mp_sub_d TclBN_s_mp_sub_d -#define mp_init_set TclBN_s_mp_init_set -#define mp_mul_d TclBN_s_mp_mul_d -#define mp_set TclBN_s_mp_set -#define mp_expt_u32 TclBN_s_mp_expt_u32 - #define bn_reverse TclBN_reverse #define mp_add TclBN_mp_add #define mp_and TclBN_mp_and @@ -656,18 +646,9 @@ extern const TclTomMathStubs *tclTomMathStubsPtr; #undef mp_isodd #define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO) -#define mp_iseven(a) (((a)->used == 0 || (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO) - -#ifndef BUILD_tcl -#undef mp_add_d -#undef mp_cmp_d -#undef mp_div_d -#undef mp_div_3 -#undef mp_sub_d -#undef mp_init_set -#undef mp_mul_d -#undef mp_set -#undef mp_expt_u32 +#define mp_iseven(a) (!mp_isodd(a)) + +#if !defined(BUILD_tcl) || defined(USE_TCL_STUBS) #define mp_add_d TclBN_mp_add_d #define mp_cmp_d TclBN_mp_cmp_d #define mp_div_d TclBN_mp_div_d @@ -677,6 +658,16 @@ extern const TclTomMathStubs *tclTomMathStubsPtr; #define mp_mul_d TclBN_mp_mul_d #define mp_set TclBN_mp_set #define mp_expt_u32 TclBN_mp_expt_u32 +#else +#define mp_add_d TclBN_s_mp_add_d +#define mp_cmp_d TclBN_s_mp_cmp_d +#define mp_div_d TclBN_s_mp_div_d +#define mp_div_3 TclBN_s_mp_div_3 +#define mp_sub_d TclBN_s_mp_sub_d +#define mp_init_set TclBN_s_mp_init_set +#define mp_mul_d TclBN_s_mp_mul_d +#define mp_set TclBN_s_mp_set +#define mp_expt_u32 TclBN_s_mp_expt_u32 #endif /* !BUILD_tcl */ #undef TCL_STORAGE_CLASS |