(cherrypick) small part of: [26870862f0]: Wrong sentinel in Tcl_SetErrorCode usage; Handle any C++-compiler as well

3 files changed, 6 insertions, 6 deletions

diff --git a/libtommath/bn_mp_div.c b/libtommath/bn_mp_div.c
index 71de55b..bca227d 100644
--- a/libtommath/bn_mp_div.c
+++ b/libtommath/bn_mp_div.c
@@ -31,7 +31,7 @@ mp_err mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d)
    }
 
    /* init our temps */
-   if ((err = mp_init_multi(&ta, &tb, &tq, &q, NULL)) != MP_OKAY) {
+   if ((err = mp_init_multi(&ta, &tb, &tq, &q, (void *)NULL)) != MP_OKAY) {
       return err;
    }
 
@@ -64,7 +64,7 @@ mp_err mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d)
       d->sign = MP_IS_ZERO(d) ? MP_ZPOS : n;
    }
 LBL_ERR:
-   mp_clear_multi(&ta, &tb, &tq, &q, NULL);
+   mp_clear_multi(&ta, &tb, &tq, &q, (void *)NULL);
    return err;
 }
 
diff --git a/libtommath/bn_s_mp_balance_mul.c b/libtommath/bn_s_mp_balance_mul.c
index 7ece5d7..557cc1d 100644
--- a/libtommath/bn_s_mp_balance_mul.c
+++ b/libtommath/bn_s_mp_balance_mul.c
@@ -19,7 +19,7 @@ mp_err s_mp_balance_mul(const mp_int *a, const mp_int *b, mp_int *c)
    if ((err = mp_init_size(&a0, bsize + 2)) != MP_OKAY) {
       return err;
    }
-   if ((err = mp_init_multi(&tmp, &r, NULL)) != MP_OKAY) {
+   if ((err = mp_init_multi(&tmp, &r, (void *)NULL)) != MP_OKAY) {
       mp_clear(&a0);
       return err;
    }
@@ -75,7 +75,7 @@ mp_err s_mp_balance_mul(const mp_int *a, const mp_int *b, mp_int *c)
 
    mp_exch(&r,c);
 LBL_ERR:
-   mp_clear_multi(&a0, &tmp, &r,NULL);
+   mp_clear_multi(&a0, &tmp, &r, (void *)NULL);
    return err;
 }
 #endif
diff --git a/libtommath/bn_s_mp_toom_mul.c b/libtommath/bn_s_mp_toom_mul.c
index 86901b0..c7db3a5 100644
--- a/libtommath/bn_s_mp_toom_mul.c
+++ b/libtommath/bn_s_mp_toom_mul.c
@@ -36,7 +36,7 @@ mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
    mp_err err;
 
    /* init temps */
-   if ((err = mp_init_multi(&S1, &S2, &T1, NULL)) != MP_OKAY) {
+   if ((err = mp_init_multi(&S1, &S2, &T1, (void *)NULL)) != MP_OKAY) {
       return err;
    }
 
@@ -208,7 +208,7 @@ LBL_ERRa2:
 LBL_ERRa1:
    mp_clear(&a0);
 LBL_ERRa0:
-   mp_clear_multi(&S1, &S2, &T1, NULL);
+   mp_clear_multi(&S1, &S2, &T1, (void *)NULL);
    return err;
 }