>From 02ef9a511ea44349d908fa72188bbdc3dc9f3c6b Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Tue, 11 Sep 2012 11:42:47 +0400 Subject: [PATCH] Fix mpz_unitstbit compilation with GMP versions < 5. --- lib/nettle/wmnaf.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/nettle/wmnaf.c b/lib/nettle/wmnaf.c index 778518a..b7eb092 100644 --- a/lib/nettle/wmnaf.c +++ b/lib/nettle/wmnaf.c @@ -33,19 +33,23 @@ #define ABS(x) ((x) >= 0 ? (x) : -(x)) +/* GMP lacks this typedef in versions prior to 5 */ +#if __GNU_MP__ < 5 +typedef unsigned long int mp_bitcnt_t; +#endif + /* * A local replacement for mpz_tstbit. - * It is needed because for negative numbers original mpz_tstbit - * returns an infinite number of `1`s after all bits of input number. - * For positive numbers it returns zeros after all bits of input number. + * It is needed because original mpz_tstbit process negative numbers + * in a two-complement manner and we don't want it. * This function mimics mpz_tstbit behavior for positive numbers in both cases. */ static int -mpz_unitstbit (mpz_srcptr u, mp_bitcnt_t bit_index) +mpz_unitstbit (mpz_t u, mp_bitcnt_t bit_index) __GMP_NOTHROW { - mp_srcptr u_ptr = (u)->_mp_d; - mp_size_t size = (u)->_mp_size; + mp_srcptr u_ptr = u->_mp_d; + mp_size_t size = u->_mp_size; unsigned abs_size = ABS (size); mp_size_t limb_index = bit_index / GMP_NUMB_BITS; mp_srcptr p = u_ptr + limb_index; -- 1.7.8.6