Commit 24b18907 authored by Yang Tse's avatar Yang Tse
Browse files

s/SIZEOF_CURL_OFF_T/CURL_SIZEOF_CURL_OFF_T/g

parent 3a1d2837

lib/mprintf.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static long dprintf_Pass1(const char *format, va_stack_t *vto, char **endpos, 
#endif

          break;

        case 'O':

#if SIZEOF_CURL_OFF_T > 4

#if CURL_SIZEOF_CURL_OFF_T > 4

          flags |= FLAGS_LONGLONG;

#else

          flags |= FLAGS_LONG;

lib/progress.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static char *max5data(curl_off_t bytes, char *max5) 
             (int)(bytes/ONE_MEGABYTE),

             (int)(bytes%ONE_MEGABYTE)/(ONE_MEGABYTE/10) );

  }

#if SIZEOF_CURL_OFF_T > 4

#if CURL_SIZEOF_CURL_OFF_T > 4

  else if(bytes < ( (curl_off_t)10000*ONE_MEGABYTE))

    /* 'XXXXM' is good until we're at 10000MB or above */

    snprintf(max5, 6, "%4" FORMAT_OFF_T "M", (curl_off_t)(bytes/ONE_MEGABYTE));

lib/setup.h

+4 −6
Original line number Diff line number Diff line
@@ -112,14 +112,12 @@ 
#include <curl/curlrules.h>



/*

 * Set up internal curl_off_t size macro

 * Ensure that no one is using the old SIZEOF_CURL_OFF_T macro

 */



#ifdef SIZEOF_CURL_OFF_T

#  error "SIZEOF_CURL_OFF_T shall not be defined before this point!"

   Error Compilation_aborted_SIZEOF_CURL_OFF_T_already_defined

#else

#  define SIZEOF_CURL_OFF_T CURL_SIZEOF_CURL_OFF_T

#  error "SIZEOF_CURL_OFF_T shall not be defined!"

   Error Compilation_aborted_SIZEOF_CURL_OFF_T_shall_not_be_defined

#endif



/*
@@ -284,7 +282,7 @@ 




/* To make large file support transparent even on Windows */

#if defined(WIN32) && (SIZEOF_CURL_OFF_T > 4)

#if defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T > 4)

#include <sys/stat.h>   /* must come first before we redefine stat() */

#include <io.h>

#define lseek(x,y,z) _lseeki64(x, y, z)

lib/strtoofft.h

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 * not, should try to emulate its functionality.  At any rate, we define

 * 'strtoofft' such that it can be used to work with curl_off_t's regardless.

 */

#if (SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8)

#if (CURL_SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8)

#ifdef HAVE_STRTOLL

#define curlx_strtoofft strtoll

#else /* HAVE_STRTOLL */
@@ -54,7 +54,7 @@ curl_off_t curlx_strtoll(const char *nptr, char **endptr, int base); 
#endif /* MSVC7 or later */



#endif /* HAVE_STRTOLL */

#else /* (SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8) */

#else /* (CURL_SIZEOF_CURL_OFF_T > 4) && (SIZEOF_LONG < 8) */

/* simply use strtol() to get numbers, either 32 or 64 bit */

#define curlx_strtoofft strtol

#endif

lib/version.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static curl_version_info_data version_info = { 
#ifdef HAVE_SPNEGO

  | CURL_VERSION_SPNEGO

#endif

#if defined(ENABLE_64BIT) && (SIZEOF_CURL_OFF_T > 4)

#if defined(ENABLE_64BIT) && (CURL_SIZEOF_CURL_OFF_T > 4)

  | CURL_VERSION_LARGEFILE

#endif

#if defined(CURL_DOES_CONVERSIONS)