Commit 1c68e790 authored by Yang Tse's avatar Yang Tse
Browse files

Simplify condition check

parent 473a050f

lib/setup.h

+5 −15
Original line number Diff line number Diff line
@@ -135,22 +135,12 @@ 
   Error Compilation_aborted_FORMAT_OFF_TU_already_defined

#endif



#if (CURL_SIZEOF_CURL_OFF_T > 4)

#  if (CURL_SIZEOF_LONG > 4)

#    define FORMAT_OFF_T  "ld"

#    define FORMAT_OFF_TU "lu"

#  else

#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)

#  define FORMAT_OFF_T  "lld"

#  define FORMAT_OFF_TU "llu"

#  endif

#else

#  if (CURL_SIZEOF_LONG > 2)

#  define FORMAT_OFF_T  "ld"

#  define FORMAT_OFF_TU "lu"

#  else

#    define FORMAT_OFF_T  "lld"

#    define FORMAT_OFF_TU "llu"

#  endif

#endif



/*

tests/libtest/lib557.c

+4 −11
Original line number Diff line number Diff line
@@ -18,20 +18,13 @@ 
int curl_msprintf(char *buffer, const char *format, ...);





#if (CURL_SIZEOF_CURL_OFF_T > 4)

#  if (CURL_SIZEOF_LONG > 4)

#    define MPRNT_SUFFIX_CURL_OFF_T  L

#  else

#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)

#  define MPRNT_SUFFIX_CURL_OFF_T  LL

#  endif

#else

#  if (CURL_SIZEOF_LONG > 2)

#  define MPRNT_SUFFIX_CURL_OFF_T  L

#  else

#    define MPRNT_SUFFIX_CURL_OFF_T  LL

#  endif

#endif





#ifdef CURL_ISOCPP

#  define MPRNT_OFF_T_C_HELPER2(Val,Suffix) Val ## Suffix

#else