config: remove the check for and use of SIZEOF_SHORT
shorts are 2 bytes on all platforms curl runs and have ever run on.
Closes #9291
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fce0899..06a0a85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1003,7 +1003,6 @@
check_type_size(ssize_t SIZEOF_SSIZE_T)
check_type_size("long long" SIZEOF_LONG_LONG)
check_type_size("long" SIZEOF_LONG)
-check_type_size("short" SIZEOF_SHORT)
check_type_size("int" SIZEOF_INT)
check_type_size("__int64" SIZEOF___INT64)
check_type_size("time_t" SIZEOF_TIME_T)
diff --git a/configure.ac b/configure.ac
index 44bf42b..981bb26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3293,7 +3293,6 @@
CURL_SIZEOF(size_t)
CURL_SIZEOF(long)
CURL_SIZEOF(int)
-CURL_SIZEOF(short)
CURL_SIZEOF(time_t)
CURL_SIZEOF(off_t)
diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 1615a1c..409dd78 100644
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -71,7 +71,6 @@
#define NEED_MALLOC_H 1
#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
#define SIZEOF_SIZE_T 4
#define USE_MANUAL 1
diff --git a/lib/config-dos.h b/lib/config-dos.h
index 2aadc41..859dc38 100644
--- a/lib/config-dos.h
+++ b/lib/config-dos.h
@@ -80,7 +80,6 @@
#define SIZEOF_INT 4
#define SIZEOF_LONG 4
-#define SIZEOF_SHORT 2
#define SIZEOF_SIZE_T 4
#define SIZEOF_CURL_OFF_T 4
#define STDC_HEADERS 1
diff --git a/lib/config-mac.h b/lib/config-mac.h
index 4928866..ed07019 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -76,7 +76,6 @@
#define HAVE_IOCTL_FIONBIO 1
#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
#define SIZEOF_SIZE_T 4
#define HAVE_RECV 1
diff --git a/lib/config-os400.h b/lib/config-os400.h
index 205432f..2eef1a0 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -254,9 +254,6 @@
/* The size of a `long long', as computed by sizeof. */
#define SIZEOF_LONG_LONG 8
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4
diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index 4e4a4bd..b9b7b96 100644
--- a/lib/config-plan9.h
+++ b/lib/config-plan9.h
@@ -48,7 +48,6 @@
#error not implement
#else
#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
#define SIZEOF_LONG 4
#define SIZEOF_OFF_T 8
#define SIZEOF_CURL_OFF_T 4 /* curl_off_t = timediff_t = int */
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 71a67b0..d6c81f3 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -229,9 +229,6 @@
/* The size of `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
/* The size of `size_t', as computed by sizeof. */
#define SIZEOF_SIZE_T 4
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 83484dd..0ac529d 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -283,9 +283,6 @@
/* Define to the size of `long long', as computed by sizeof. */
/* #define SIZEOF_LONG_LONG 8 */
-/* Define to the size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
/* Define to the size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index ede63c9..308bfe9 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -231,9 +231,6 @@
/* The size of `long long', as computed by sizeof. */
/* #define SIZEOF_LONG_LONG 8 */
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
/* Define to the size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 8cf1da6..d1ea23f 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -697,9 +697,6 @@
/* The size of `int', as computed by sizeof. */
${SIZEOF_INT_CODE}
-/* The size of `short', as computed by sizeof. */
-${SIZEOF_SHORT_CODE}
-
/* The size of `long', as computed by sizeof. */
${SIZEOF_LONG_CODE}
diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index d9f5c4e..578ab71 100644
--- a/tests/libtest/lib557.c
+++ b/tests/libtest/lib557.c
@@ -127,25 +127,6 @@
int num_ushort_tests = 0;
int failed = 0;
-#if (SIZEOF_SHORT == 1)
-
- i = 1; us_test[i].num = 0xFFU; us_test[i].expected = "256";
- i++; us_test[i].num = 0xF0U; us_test[i].expected = "240";
- i++; us_test[i].num = 0x0FU; us_test[i].expected = "15";
-
- i++; us_test[i].num = 0xE0U; us_test[i].expected = "224";
- i++; us_test[i].num = 0x0EU; us_test[i].expected = "14";
-
- i++; us_test[i].num = 0xC0U; us_test[i].expected = "192";
- i++; us_test[i].num = 0x0CU; us_test[i].expected = "12";
-
- i++; us_test[i].num = 0x01U; us_test[i].expected = "1";
- i++; us_test[i].num = 0x00U; us_test[i].expected = "0";
-
- num_ushort_tests = i;
-
-#elif (SIZEOF_SHORT == 2)
-
i = 1; us_test[i].num = 0xFFFFU; us_test[i].expected = "65535";
i++; us_test[i].num = 0xFF00U; us_test[i].expected = "65280";
i++; us_test[i].num = 0x00FFU; us_test[i].expected = "255";
@@ -165,42 +146,6 @@
num_ushort_tests = i;
-#elif (SIZEOF_SHORT == 4)
-
- i = 1; us_test[i].num = 0xFFFFFFFFU; us_test[i].expected = "4294967295";
- i++; us_test[i].num = 0xFFFF0000U; us_test[i].expected = "4294901760";
- i++; us_test[i].num = 0x0000FFFFU; us_test[i].expected = "65535";
-
- i++; us_test[i].num = 0xFF000000U; us_test[i].expected = "4278190080";
- i++; us_test[i].num = 0x00FF0000U; us_test[i].expected = "16711680";
- i++; us_test[i].num = 0x0000FF00U; us_test[i].expected = "65280";
- i++; us_test[i].num = 0x000000FFU; us_test[i].expected = "255";
-
- i++; us_test[i].num = 0xF0000000U; us_test[i].expected = "4026531840";
- i++; us_test[i].num = 0x0F000000U; us_test[i].expected = "251658240";
- i++; us_test[i].num = 0x00F00000U; us_test[i].expected = "15728640";
- i++; us_test[i].num = 0x000F0000U; us_test[i].expected = "983040";
- i++; us_test[i].num = 0x0000F000U; us_test[i].expected = "61440";
- i++; us_test[i].num = 0x00000F00U; us_test[i].expected = "3840";
- i++; us_test[i].num = 0x000000F0U; us_test[i].expected = "240";
- i++; us_test[i].num = 0x0000000FU; us_test[i].expected = "15";
-
- i++; us_test[i].num = 0xC0000000U; us_test[i].expected = "3221225472";
- i++; us_test[i].num = 0x0C000000U; us_test[i].expected = "201326592";
- i++; us_test[i].num = 0x00C00000U; us_test[i].expected = "12582912";
- i++; us_test[i].num = 0x000C0000U; us_test[i].expected = "786432";
- i++; us_test[i].num = 0x0000C000U; us_test[i].expected = "49152";
- i++; us_test[i].num = 0x00000C00U; us_test[i].expected = "3072";
- i++; us_test[i].num = 0x000000C0U; us_test[i].expected = "192";
- i++; us_test[i].num = 0x0000000CU; us_test[i].expected = "12";
-
- i++; us_test[i].num = 0x00000001U; us_test[i].expected = "1";
- i++; us_test[i].num = 0x00000000U; us_test[i].expected = "0";
-
- num_ushort_tests = i;
-
-#endif
-
for(i = 1; i <= num_ushort_tests; i++) {
for(j = 0; j<BUFSZ; j++)
@@ -234,33 +179,6 @@
int num_sshort_tests = 0;
int failed = 0;
-#if (SIZEOF_SHORT == 1)
-
- i = 1; ss_test[i].num = 0x7F; ss_test[i].expected = "127";
-
- i++; ss_test[i].num = 0x70; ss_test[i].expected = "112";
- i++; ss_test[i].num = 0x07; ss_test[i].expected = "7";
-
- i++; ss_test[i].num = 0x50; ss_test[i].expected = "80";
- i++; ss_test[i].num = 0x05; ss_test[i].expected = "5";
-
- i++; ss_test[i].num = 0x01; ss_test[i].expected = "1";
- i++; ss_test[i].num = 0x00; ss_test[i].expected = "0";
-
- i++; ss_test[i].num = -0x7F -1; ss_test[i].expected = "-128";
-
- i++; ss_test[i].num = -0x70 -1; ss_test[i].expected = "-113";
- i++; ss_test[i].num = -0x07 -1; ss_test[i].expected = "-8";
-
- i++; ss_test[i].num = -0x50 -1; ss_test[i].expected = "-81";
- i++; ss_test[i].num = -0x05 -1; ss_test[i].expected = "-6";
-
- i++; ss_test[i].num = 0x00 -1; ss_test[i].expected = "-1";
-
- num_sshort_tests = i;
-
-#elif (SIZEOF_SHORT == 2)
-
i = 1; ss_test[i].num = 0x7FFF; ss_test[i].expected = "32767";
i++; ss_test[i].num = 0x7FFE; ss_test[i].expected = "32766";
i++; ss_test[i].num = 0x7FFD; ss_test[i].expected = "32765";
@@ -302,75 +220,6 @@
num_sshort_tests = i;
-#elif (SIZEOF_SHORT == 4)
-
- i = 1; ss_test[i].num = 0x7FFFFFFF; ss_test[i].expected = "2147483647";
- i++; ss_test[i].num = 0x7FFFFFFE; ss_test[i].expected = "2147483646";
- i++; ss_test[i].num = 0x7FFFFFFD; ss_test[i].expected = "2147483645";
- i++; ss_test[i].num = 0x7FFF0000; ss_test[i].expected = "2147418112";
- i++; ss_test[i].num = 0x00007FFF; ss_test[i].expected = "32767";
-
- i++; ss_test[i].num = 0x7F000000; ss_test[i].expected = "2130706432";
- i++; ss_test[i].num = 0x007F0000; ss_test[i].expected = "8323072";
- i++; ss_test[i].num = 0x00007F00; ss_test[i].expected = "32512";
- i++; ss_test[i].num = 0x0000007F; ss_test[i].expected = "127";
-
- i++; ss_test[i].num = 0x70000000; ss_test[i].expected = "1879048192";
- i++; ss_test[i].num = 0x07000000; ss_test[i].expected = "117440512";
- i++; ss_test[i].num = 0x00700000; ss_test[i].expected = "7340032";
- i++; ss_test[i].num = 0x00070000; ss_test[i].expected = "458752";
- i++; ss_test[i].num = 0x00007000; ss_test[i].expected = "28672";
- i++; ss_test[i].num = 0x00000700; ss_test[i].expected = "1792";
- i++; ss_test[i].num = 0x00000070; ss_test[i].expected = "112";
- i++; ss_test[i].num = 0x00000007; ss_test[i].expected = "7";
-
- i++; ss_test[i].num = 0x50000000; ss_test[i].expected = "1342177280";
- i++; ss_test[i].num = 0x05000000; ss_test[i].expected = "83886080";
- i++; ss_test[i].num = 0x00500000; ss_test[i].expected = "5242880";
- i++; ss_test[i].num = 0x00050000; ss_test[i].expected = "327680";
- i++; ss_test[i].num = 0x00005000; ss_test[i].expected = "20480";
- i++; ss_test[i].num = 0x00000500; ss_test[i].expected = "1280";
- i++; ss_test[i].num = 0x00000050; ss_test[i].expected = "80";
- i++; ss_test[i].num = 0x00000005; ss_test[i].expected = "5";
-
- i++; ss_test[i].num = 0x00000001; ss_test[i].expected = "1";
- i++; ss_test[i].num = 0x00000000; ss_test[i].expected = "0";
-
- i++; ss_test[i].num = -0x7FFFFFFF -1; ss_test[i].expected = "-2147483648";
- i++; ss_test[i].num = -0x7FFFFFFE -1; ss_test[i].expected = "-2147483647";
- i++; ss_test[i].num = -0x7FFFFFFD -1; ss_test[i].expected = "-2147483646";
- i++; ss_test[i].num = -0x7FFF0000 -1; ss_test[i].expected = "-2147418113";
- i++; ss_test[i].num = -0x00007FFF -1; ss_test[i].expected = "-32768";
-
- i++; ss_test[i].num = -0x7F000000 -1; ss_test[i].expected = "-2130706433";
- i++; ss_test[i].num = -0x007F0000 -1; ss_test[i].expected = "-8323073";
- i++; ss_test[i].num = -0x00007F00 -1; ss_test[i].expected = "-32513";
- i++; ss_test[i].num = -0x0000007F -1; ss_test[i].expected = "-128";
-
- i++; ss_test[i].num = -0x70000000 -1; ss_test[i].expected = "-1879048193";
- i++; ss_test[i].num = -0x07000000 -1; ss_test[i].expected = "-117440513";
- i++; ss_test[i].num = -0x00700000 -1; ss_test[i].expected = "-7340033";
- i++; ss_test[i].num = -0x00070000 -1; ss_test[i].expected = "-458753";
- i++; ss_test[i].num = -0x00007000 -1; ss_test[i].expected = "-28673";
- i++; ss_test[i].num = -0x00000700 -1; ss_test[i].expected = "-1793";
- i++; ss_test[i].num = -0x00000070 -1; ss_test[i].expected = "-113";
- i++; ss_test[i].num = -0x00000007 -1; ss_test[i].expected = "-8";
-
- i++; ss_test[i].num = -0x50000000 -1; ss_test[i].expected = "-1342177281";
- i++; ss_test[i].num = -0x05000000 -1; ss_test[i].expected = "-83886081";
- i++; ss_test[i].num = -0x00500000 -1; ss_test[i].expected = "-5242881";
- i++; ss_test[i].num = -0x00050000 -1; ss_test[i].expected = "-327681";
- i++; ss_test[i].num = -0x00005000 -1; ss_test[i].expected = "-20481";
- i++; ss_test[i].num = -0x00000500 -1; ss_test[i].expected = "-1281";
- i++; ss_test[i].num = -0x00000050 -1; ss_test[i].expected = "-81";
- i++; ss_test[i].num = -0x00000005 -1; ss_test[i].expected = "-6";
-
- i++; ss_test[i].num = 0x00000000 -1; ss_test[i].expected = "-1";
-
- num_sshort_tests = i;
-
-#endif
-
for(i = 1; i <= num_sshort_tests; i++) {
for(j = 0; j<BUFSZ; j++)
