diff --git a/CMakeLists.txt b/CMakeLists.txt index fce08996a1..06a0a8558c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1003,7 +1003,6 @@ check_type_size(size_t SIZEOF_SIZE_T) 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 44bf42b9d7..981bb26a40 100644 --- a/configure.ac +++ b/configure.ac @@ -3293,7 +3293,6 @@ CURL_VERIFY_RUNTIMELIBS 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 1615a1c53b..409dd78701 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 2aadc4172c..859dc387a1 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 4928866b15..ed07019e6b 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 205432fad6..2eef1a0c1b 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 4e4a4bd302..b9b7b96430 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 71a67b0e16..d6c81f3eb9 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 83484ddbed..0ac529d250 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 ede63c94db..308bfe9e0a 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 8cf1da600e..d1ea23f51c 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 d9f5c4e63b..578ab713b3 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -127,25 +127,6 @@ static int test_unsigned_short_formatting(void) 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 @@ static int test_unsigned_short_formatting(void) 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