diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2021-06-23 22:29:17 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2021-08-26 20:30:31 +0300 |
| commit | 9e3b0446653fda6912e91fae84883cdbefdc2195 (patch) | |
| tree | d5a8a8187268019256f35d87eca4ab44e6283e16 | |
| parent | 581e04386d875672ba6c3fc4a4232ca72bc46c8c (diff) | |
| download | libgcrypt-9e3b0446653fda6912e91fae84883cdbefdc2195.tar.gz | |
mpi/longlong: fix variable shadowing from MIPS umul_ppmm macros
* mpi/longlong.h [__mips__ && W_TIPE_SIZE == 32] (umul_ppmm): Rename
temporary variable '_r' to '__r'.
[__mips && W_TIPE_SIZE == 64] (umul_ppmm): Ditto.
--
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
| -rw-r--r-- | mpi/longlong.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mpi/longlong.h b/mpi/longlong.h index 630993b4..39cdd0c2 100644 --- a/mpi/longlong.h +++ b/mpi/longlong.h @@ -864,10 +864,10 @@ extern USItype __udiv_qrnnd (); __GNUC_MINOR__ >= 4) # define umul_ppmm(w1, w0, u, v) \ do { \ - UDItype _r; \ - _r = (UDItype)(u) * (v); \ - (w1) = _r >> 32; \ - (w0) = (USItype) _r; \ + UDItype __r; \ + __r = (UDItype)(u) * (v); \ + (w1) = __r >> 32; \ + (w0) = (USItype) __r; \ } while (0) # elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 # define umul_ppmm(w1, w0, u, v) \ @@ -898,11 +898,11 @@ extern USItype __udiv_qrnnd (); __GNUC_MINOR__ >= 4) typedef unsigned int UTItype __attribute__ ((mode (TI))); # define umul_ppmm(w1, w0, u, v) \ - do { \ - UTItype _r; \ - _r = (UTItype)(u) * (v); \ - (w1) = _r >> 64; \ - (w0) = (UDItype) _r; \ + do { \ + UTItype __r; \ + __r = (UTItype)(u) * (v); \ + (w1) = __r >> 64; \ + (w0) = (UDItype) __r; \ } while (0) # elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 # define umul_ppmm(w1, w0, u, v) \ |