diff options
| -rwxr-xr-x | acinclude.m4 | 14 | ||||
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rw-r--r-- | lib/mprintf.c | 8 | ||||
| -rw-r--r-- | lib/warnless.c | 4 | ||||
| -rw-r--r-- | src/tool_operate.c | 14 |
5 files changed, 11 insertions, 30 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 957b9202f..69bb6c002 100755 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2084,20 +2084,6 @@ _EOF ]) -dnl CURL_CONFIGURE_LONG -dnl ------------------------------------------------- -dnl Find out the size of long as reported by sizeof() and define -dnl CURL_SIZEOF_LONG. - -AC_DEFUN([CURL_CONFIGURE_LONG], [ - if test -z "$ac_cv_sizeof_long" || - test "$ac_cv_sizeof_long" -eq "0"; then - AC_MSG_ERROR([cannot find out size of long.]) - fi - CURL_DEFINE_UNQUOTED([CURL_SIZEOF_LONG], [$ac_cv_sizeof_long]) -]) - - dnl CURL_CONFIGURE_CURL_SOCKLEN_T dnl ------------------------------------------------- dnl The need for the curl_socklen_t definition arises mainly to properly diff --git a/configure.ac b/configure.ac index a4633b69f..1b3f82184 100755 --- a/configure.ac +++ b/configure.ac @@ -3156,7 +3156,6 @@ AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(short) -CURL_CONFIGURE_LONG AC_CHECK_SIZEOF(time_t) AC_CHECK_SIZEOF(off_t) 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) diff --git a/src/tool_operate.c b/src/tool_operate.c index 3c8c6ed2f..202aba609 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -184,7 +184,7 @@ static curl_off_t VmsSpecialSize(const char *name, #endif /* __VMS */ #if defined(HAVE_UTIME) || \ - (defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8)) + (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) static void setfiletime(long filetime, const char *filename, FILE *error_stream) { @@ -192,10 +192,10 @@ static void setfiletime(long filetime, const char *filename, /* Windows utime() may attempt to adjust our unix gmt 'filetime' by a daylight saving time offset and since it's GMT that is bad behavior. When we have access to a 64-bit type we can bypass utime and set the times directly. */ -#if defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8) +#if defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8) HANDLE hfile; -#if (CURL_SIZEOF_LONG >= 8) +#if (SIZEOF_LONG >= 8) /* 910670515199 is the maximum unix filetime that can be used as a Windows FILETIME without overflow: 30827-12-31T23:59:59. */ if(filetime > CURL_OFF_T_C(910670515199)) { @@ -204,7 +204,7 @@ static void setfiletime(long filetime, const char *filename, filetime); return; } -#endif /* CURL_SIZEOF_LONG >= 8 */ +#endif /* SIZEOF_LONG >= 8 */ hfile = CreateFileA(filename, FILE_WRITE_ATTRIBUTES, (FILE_SHARE_READ | FILE_SHARE_WRITE | @@ -254,7 +254,7 @@ static void setfiletime(long filetime, const char *filename, } } #endif /* defined(HAVE_UTIME) || \ - (defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8)) */ + (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */ #define BUFFER_SIZE (100*1024) @@ -1844,7 +1844,7 @@ static CURLcode operate_do(struct GlobalConfig *global, #endif #if defined(HAVE_UTIME) || \ - (defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8)) + (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) /* File time can only be set _after_ the file has been closed */ if(!result && config->remote_time && outs.s_isreg && outs.filename) { /* Ask libcurl if we got a remote file time */ @@ -1854,7 +1854,7 @@ static CURLcode operate_do(struct GlobalConfig *global, setfiletime(filetime, outs.filename, config->global->errors); } #endif /* defined(HAVE_UTIME) || \ - (defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8)) */ + (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */ #ifdef USE_METALINK if(!metalink && config->use_metalink && result == CURLE_OK) { |