From 6b9bc5a4fe5ebfb884a0ea7fe0329923cd4b774c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 16 Aug 2017 10:25:49 +0200 Subject: CURL_SIZEOF_LONG: removed, use only SIZEOF_LONG --- lib/mprintf.c | 8 ++------ lib/warnless.c | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/mprintf.c b/lib/mprintf.c index 4e94b10ad..9920a0d3c 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -46,10 +46,6 @@ * If SIZEOF_SIZE_T has not been defined, default to the size of long. */ -#ifndef SIZEOF_SIZE_T -# define SIZEOF_SIZE_T CURL_SIZEOF_LONG -#endif - #ifdef HAVE_LONGLONG # define LONG_LONG_TYPE long long # define HAVE_LONG_LONG_TYPE @@ -326,7 +322,7 @@ static int dprintf_Pass1(const char *format, va_stack_t *vto, char **endpos, break; #if defined(MP_HAVE_INT_EXTENSIONS) case 'I': -#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG) +#if (SIZEOF_CURL_OFF_T > SIZEOF_LONG) flags |= FLAGS_LONGLONG; #else flags |= FLAGS_LONG; @@ -355,7 +351,7 @@ static int dprintf_Pass1(const char *format, va_stack_t *vto, char **endpos, #endif break; case 'O': -#if (CURL_SIZEOF_CURL_OFF_T > SIZEOF_LONG) +#if (SIZEOF_CURL_OFF_T > SIZEOF_LONG) flags |= FLAGS_LONGLONG; #else flags |= FLAGS_LONG; diff --git a/lib/warnless.c b/lib/warnless.c index 1b9fe7e17..05d9038dc 100644 --- a/lib/warnless.c +++ b/lib/warnless.c @@ -82,7 +82,7 @@ # define CURL_MASK_SLONG 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL # define CURL_MASK_ULONG 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFUL #else -# error "CURL_SIZEOF_LONG not defined" +# error "SIZEOF_LONG not defined" #endif #if (SIZEOF_CURL_OFF_T == 2) @@ -98,7 +98,7 @@ # define CURL_MASK_SCOFFT CURL_OFF_T_C(0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) # define CURL_MASK_UCOFFT CURL_OFF_TU_C(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) #else -# error "CURL_SIZEOF_CURL_OFF_T not defined" +# error "SIZEOF_CURL_OFF_T not defined" #endif #if (SIZEOF_SIZE_T == SIZEOF_SHORT) -- cgit v1.2.3