diff options
| author | Sverker Eriksson <[email protected]> | 2019-02-06 11:35:38 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-02-06 11:35:38 +0100 |
| commit | b01083b47699f0494053abfbe7ae1f50142b1b49 (patch) | |
| tree | af8250f967980ee7066cc0b4934c2b436ef1493e /erts/emulator | |
| parent | c2126443b79aa53c9fc04e7dad4e6c717ca6986b (diff) | |
| parent | 34e50bccfcf64bb31358f4fa4b220de71f5bae06 (diff) | |
| download | otp-b01083b47699f0494053abfbe7ae1f50142b1b49.tar.gz otp-b01083b47699f0494053abfbe7ae1f50142b1b49.tar.bz2 otp-b01083b47699f0494053abfbe7ae1f50142b1b49.zip | |
Merge branch 'sverker/fix-compile-warning' into maint
* sverker/fix-compile-warning:
erts: Fix compiler warning for IS_SSMALL
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/big.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h index 6e6d7b5a4b..274482a0d2 100644 --- a/erts/emulator/beam/big.h +++ b/erts/emulator/beam/big.h @@ -81,7 +81,11 @@ typedef Uint dsize_t; /* Vector size type */ * a Uint64 argument. Therefore, we must test the size of the argument * to ensure that the cast does not discard the high-order 32 bits. */ -#define _IS_SSMALL32(x) (((Uint32) ((((x)) >> (SMALL_BITS-1)) + 1)) < 2) +#if defined(ARCH_32) +# define _IS_SSMALL32(x) (((Uint32) ((((x)) >> (SMALL_BITS-1)) + 1)) < 2) +#else +# define _IS_SSMALL32(x) (1) +#endif #define _IS_SSMALL64(x) (((Uint64) ((((x)) >> (SMALL_BITS-1)) + 1)) < 2) #define IS_SSMALL(x) (sizeof(x) == sizeof(Uint32) ? _IS_SSMALL32(x) : _IS_SSMALL64(x)) |