From b2dd46398fd1bc3dfec1115e83acce116c7e6f6c Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 23 Aug 2016 00:24:17 +0000 Subject: [PATCH] zero_extend_signed_to_ull: add short int support * defs.h (zero_extend_signed_to_ull): Add short int support. * tests/tests.h: Likewise. --- defs.h | 3 ++- tests/tests.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defs.h b/defs.h index fc64d94e..b17368be 100644 --- a/defs.h +++ b/defs.h @@ -750,7 +750,8 @@ extern unsigned current_wordsize; * Zero-extend a signed integer type to unsigned long long. */ #define zero_extend_signed_to_ull(v) \ - (sizeof(v) == sizeof(int) ? (unsigned long long) (unsigned int) (v) : \ + (sizeof(v) == sizeof(short) ? (unsigned long long) (unsigned short) (v) : \ + sizeof(v) == sizeof(int) ? (unsigned long long) (unsigned int) (v) : \ sizeof(v) == sizeof(long) ? (unsigned long long) (unsigned long) (v) : \ (unsigned long long) (v)) diff --git a/tests/tests.h b/tests/tests.h index 5e170fec..d4607f24 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -124,7 +124,8 @@ int send_mmsg(int, struct mmsghdr *, unsigned int, unsigned int); * Zero-extend a signed integer type to unsigned long long. */ #define zero_extend_signed_to_ull(v) \ - (sizeof(v) == sizeof(int) ? (unsigned long long) (unsigned int) (v) : \ + (sizeof(v) == sizeof(short) ? (unsigned long long) (unsigned short) (v) : \ + sizeof(v) == sizeof(int) ? (unsigned long long) (unsigned int) (v) : \ sizeof(v) == sizeof(long) ? (unsigned long long) (unsigned long) (v) : \ (unsigned long long) (v)) -- 2.40.0