zero_extend_signed_to_ull: add short int support

* defs.h (zero_extend_signed_to_ull): Add short int support.
* tests/tests.h: Likewise.

diff --git a/defs.h b/defs.h
index fc64d94e969a44d9c8c8693c1e56559f8c7c34e0..b17368be2b17b20e26ed136a5446324c4123e0b6 100644 (file)
--- 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 5e170fec9781631c3be0bb830e6ef9c6657de30c..d4607f24c81cada56dcc1c035f359a9547cde9e0 100644 (file)
--- 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))