Added missing signed and unsigned curl_off_t integer constant suffixes for

internal and external use. CURL_SUFFIX_CURL_OFF_T, CURL_SUFFIX_CURL_OFF_TU.

2 files changed, 216 insertions, 150 deletions

diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index 07b8abea7..e622e5bac 100644
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -139,209 +139,265 @@
 /* ================================================================ */
 
 #if defined(__DJGPP__)
-#  define CURL_OFF_T             long
-#  define CURL_FMT_OFF_T         "ld"
-#  define CURL_FMT_OFF_TU        "lu"
-#  define CURL_FORMAT_OFF_T      "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T 4
+#  define CURL_OFF_T              long
+#  define CURL_FMT_OFF_T          "ld"
+#  define CURL_FMT_OFF_TU         "lu"
+#  define CURL_FORMAT_OFF_T       "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T  4
+#  define CURL_SUFFIX_CURL_OFF_T  L
+#  define CURL_SUFFIX_CURL_OFF_TU uL
 
 #elif defined(__SALFORDC__)
-#  define CURL_OFF_T             long
-#  define CURL_FMT_OFF_T         "ld"
-#  define CURL_FMT_OFF_TU        "lu"
-#  define CURL_FORMAT_OFF_T      "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T 4
+#  define CURL_OFF_T              long
+#  define CURL_FMT_OFF_T          "ld"
+#  define CURL_FMT_OFF_TU         "lu"
+#  define CURL_FORMAT_OFF_T       "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T  4
+#  define CURL_SUFFIX_CURL_OFF_T  L
+#  define CURL_SUFFIX_CURL_OFF_TU uL
 
 #elif defined(__BORLANDC__)
 #  if (__BORLANDC__ < 0x520)
-#    define CURL_OFF_T             long
-#    define CURL_FMT_OFF_T         "ld"
-#    define CURL_FMT_OFF_TU        "lu"
-#    define CURL_FORMAT_OFF_T      "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T 4
+#    define CURL_OFF_T              long
+#    define CURL_FMT_OFF_T          "ld"
+#    define CURL_FMT_OFF_TU         "lu"
+#    define CURL_FORMAT_OFF_T       "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T  4
+#    define CURL_SUFFIX_CURL_OFF_T  L
+#    define CURL_SUFFIX_CURL_OFF_TU uL
 #  else
-#    define CURL_OFF_T             __int64
-#    define CURL_FMT_OFF_T         "I64d"
-#    define CURL_FMT_OFF_TU        "I64u"
-#    define CURL_FORMAT_OFF_T      "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              __int64
+#    define CURL_FMT_OFF_T          "I64d"
+#    define CURL_FMT_OFF_TU         "I64u"
+#    define CURL_FORMAT_OFF_T       "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  i64
+#    define CURL_SUFFIX_CURL_OFF_TU ui64
 #  endif
 
 #elif defined(__TURBOC__)
-#  define CURL_OFF_T             long
-#  define CURL_FMT_OFF_T         "ld"
-#  define CURL_FMT_OFF_TU        "lu"
-#  define CURL_FORMAT_OFF_T      "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T 4
+#  define CURL_OFF_T              long
+#  define CURL_FMT_OFF_T          "ld"
+#  define CURL_FMT_OFF_TU         "lu"
+#  define CURL_FORMAT_OFF_T       "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T  4
+#  define CURL_SUFFIX_CURL_OFF_T  L
+#  define CURL_SUFFIX_CURL_OFF_TU uL
 
 #elif defined(__WATCOMC__)
 #  if defined(__386__)
-#    define CURL_OFF_T             __int64
-#    define CURL_FMT_OFF_T         "I64d"
-#    define CURL_FMT_OFF_TU        "I64u"
-#    define CURL_FORMAT_OFF_T      "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              __int64
+#    define CURL_FMT_OFF_T          "I64d"
+#    define CURL_FMT_OFF_TU         "I64u"
+#    define CURL_FORMAT_OFF_T       "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  i64
+#    define CURL_SUFFIX_CURL_OFF_TU ui64
 #  else
-#    define CURL_OFF_T             long
-#    define CURL_FMT_OFF_T         "ld"
-#    define CURL_FMT_OFF_TU        "lu"
-#    define CURL_FORMAT_OFF_T      "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T 4
+#    define CURL_OFF_T              long
+#    define CURL_FMT_OFF_T          "ld"
+#    define CURL_FMT_OFF_TU         "lu"
+#    define CURL_FORMAT_OFF_T       "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T  4
+#    define CURL_SUFFIX_CURL_OFF_T  L
+#    define CURL_SUFFIX_CURL_OFF_TU uL
 #  endif
 
 #elif defined(__POCC__)
 #  if (__POCC__ < 280)
-#    define CURL_OFF_T             long
-#    define CURL_FMT_OFF_T         "ld"
-#    define CURL_FMT_OFF_TU        "lu"
-#    define CURL_FORMAT_OFF_T      "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T 4
+#    define CURL_OFF_T              long
+#    define CURL_FMT_OFF_T          "ld"
+#    define CURL_FMT_OFF_TU         "lu"
+#    define CURL_FORMAT_OFF_T       "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T  4
+#    define CURL_SUFFIX_CURL_OFF_T  L
+#    define CURL_SUFFIX_CURL_OFF_TU uL
 #  elif defined(_MSC_VER)
-#    define CURL_OFF_T             __int64
-#    define CURL_FMT_OFF_T         "I64d"
-#    define CURL_FMT_OFF_TU        "I64u"
-#    define CURL_FORMAT_OFF_T      "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              __int64
+#    define CURL_FMT_OFF_T          "I64d"
+#    define CURL_FMT_OFF_TU         "I64u"
+#    define CURL_FORMAT_OFF_T       "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  i64
+#    define CURL_SUFFIX_CURL_OFF_TU ui64
 #  else
-#    define CURL_OFF_T             long long
-#    define CURL_FMT_OFF_T         "lld"
-#    define CURL_FMT_OFF_TU        "llu"
-#    define CURL_FORMAT_OFF_T      "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              long long
+#    define CURL_FMT_OFF_T          "lld"
+#    define CURL_FMT_OFF_TU         "llu"
+#    define CURL_FORMAT_OFF_T       "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  LL
+#    define CURL_SUFFIX_CURL_OFF_TU uLL
 #  endif
 
 #elif defined(__LCC__) 
-#  define CURL_OFF_T             long
-#  define CURL_FMT_OFF_T         "ld"
-#  define CURL_FMT_OFF_TU        "lu"
-#  define CURL_FORMAT_OFF_T      "%ld"
-#  define CURL_SIZEOF_CURL_OFF_T 4
+#  define CURL_OFF_T              long
+#  define CURL_FMT_OFF_T          "ld"
+#  define CURL_FMT_OFF_TU         "lu"
+#  define CURL_FORMAT_OFF_T       "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T  4
+#  define CURL_SUFFIX_CURL_OFF_T  L
+#  define CURL_SUFFIX_CURL_OFF_TU uL
 
 #elif defined(__SYMBIAN32__)
 #  if defined(__GCC32__)
-#    define CURL_OFF_T             long long
-#    define CURL_FMT_OFF_T         "lld"
-#    define CURL_FMT_OFF_TU        "llu"
-#    define CURL_FORMAT_OFF_T      "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              long long
+#    define CURL_FMT_OFF_T          "lld"
+#    define CURL_FMT_OFF_TU         "llu"
+#    define CURL_FORMAT_OFF_T       "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  LL
+#    define CURL_SUFFIX_CURL_OFF_TU uLL
 #  elif defined(__CW32__)
 #    pragma longlong on
-#    define CURL_OFF_T             long long
-#    define CURL_FMT_OFF_T         "lld"
-#    define CURL_FMT_OFF_TU        "llu"
-#    define CURL_FORMAT_OFF_T      "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              long long
+#    define CURL_FMT_OFF_T          "lld"
+#    define CURL_FMT_OFF_TU         "llu"
+#    define CURL_FORMAT_OFF_T       "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  LL
+#    define CURL_SUFFIX_CURL_OFF_TU uLL
 #  elif defined(__VC32__)
-#    define CURL_OFF_T             __int64
-#    define CURL_FMT_OFF_T         "lld"
-#    define CURL_FMT_OFF_TU        "llu"
-#    define CURL_FORMAT_OFF_T      "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              __int64
+#    define CURL_FMT_OFF_T          "lld"
+#    define CURL_FMT_OFF_TU         "llu"
+#    define CURL_FORMAT_OFF_T       "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  LL
+#    define CURL_SUFFIX_CURL_OFF_TU uLL
 #  endif
 
 #elif defined(__MWERKS__)
-#  define CURL_OFF_T             long long
-#  define CURL_FMT_OFF_T         "lld"
-#  define CURL_FMT_OFF_TU        "llu"
-#  define CURL_FORMAT_OFF_T      "%lld"
-#  define CURL_SIZEOF_CURL_OFF_T 8
+#  define CURL_OFF_T              long long
+#  define CURL_FMT_OFF_T          "lld"
+#  define CURL_FMT_OFF_TU         "llu"
+#  define CURL_FORMAT_OFF_T       "%lld"
+#  define CURL_SIZEOF_CURL_OFF_T  8
+#  define CURL_SUFFIX_CURL_OFF_T  LL
+#  define CURL_SUFFIX_CURL_OFF_TU uLL
 
 #elif defined(_WIN32_WCE)
-#  define CURL_OFF_T             __int64
-#  define CURL_FMT_OFF_T         "I64d"
-#  define CURL_FMT_OFF_TU        "I64u"
-#  define CURL_FORMAT_OFF_T      "%I64d"
-#  define CURL_SIZEOF_CURL_OFF_T 8
+#  define CURL_OFF_T              __int64
+#  define CURL_FMT_OFF_T          "I64d"
+#  define CURL_FMT_OFF_TU         "I64u"
+#  define CURL_FORMAT_OFF_T       "%I64d"
+#  define CURL_SIZEOF_CURL_OFF_T  8
+#  define CURL_SUFFIX_CURL_OFF_T  i64
+#  define CURL_SUFFIX_CURL_OFF_TU ui64
 
 #elif defined(__MINGW32__)
-#  define CURL_OFF_T             long long
-#  define CURL_FMT_OFF_T         "I64d"
-#  define CURL_FMT_OFF_TU        "I64u"
-#  define CURL_FORMAT_OFF_T      "%I64d"
-#  define CURL_SIZEOF_CURL_OFF_T 8
+#  define CURL_OFF_T              long long
+#  define CURL_FMT_OFF_T          "I64d"
+#  define CURL_FMT_OFF_TU         "I64u"
+#  define CURL_FORMAT_OFF_T       "%I64d"
+#  define CURL_SIZEOF_CURL_OFF_T  8
+#  define CURL_SUFFIX_CURL_OFF_T  i64
+#  define CURL_SUFFIX_CURL_OFF_TU ui64
 
 #elif defined(_MSC_VER)
 #  if (_MSC_VER >= 900)
-#    define CURL_OFF_T             __int64
-#    define CURL_FMT_OFF_T         "I64d"
-#    define CURL_FMT_OFF_TU        "I64u"
-#    define CURL_FORMAT_OFF_T      "%I64d"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              __int64
+#    define CURL_FMT_OFF_T          "I64d"
+#    define CURL_FMT_OFF_TU         "I64u"
+#    define CURL_FORMAT_OFF_T       "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  i64
+#    define CURL_SUFFIX_CURL_OFF_TU ui64
 #  else
-#    define CURL_OFF_T             long
-#    define CURL_FMT_OFF_T         "ld"
-#    define CURL_FMT_OFF_TU        "lu"
-#    define CURL_FORMAT_OFF_T      "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T 4
+#    define CURL_OFF_T              long
+#    define CURL_FMT_OFF_T          "ld"
+#    define CURL_FMT_OFF_TU         "lu"
+#    define CURL_FORMAT_OFF_T       "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T  4
+#    define CURL_SUFFIX_CURL_OFF_T  L
+#    define CURL_SUFFIX_CURL_OFF_TU uL
 #  endif
 
 #elif defined(__VMS)
 #  if defined(__alpha) || defined(__ia64)
-#    define CURL_OFF_T             long long
-#    define CURL_FMT_OFF_T         "lld"
-#    define CURL_FMT_OFF_TU        "llu"
-#    define CURL_FORMAT_OFF_T      "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              long long
+#    define CURL_FMT_OFF_T          "lld"
+#    define CURL_FMT_OFF_TU         "llu"
+#    define CURL_FORMAT_OFF_T       "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  LL
+#    define CURL_SUFFIX_CURL_OFF_TU uLL
 #  else
-#    define CURL_OFF_T             long
-#    define CURL_FMT_OFF_T         "ld"
-#    define CURL_FMT_OFF_TU        "lu"
-#    define CURL_FORMAT_OFF_T      "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T 4
+#    define CURL_OFF_T              long
+#    define CURL_FMT_OFF_T          "ld"
+#    define CURL_FMT_OFF_TU         "lu"
+#    define CURL_FORMAT_OFF_T       "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T  4
+#    define CURL_SUFFIX_CURL_OFF_T  L
+#    define CURL_SUFFIX_CURL_OFF_TU uL
 #  endif
 
 #elif defined(__OS400__)
 #  if defined(__ILEC400__)
-#    define CURL_OFF_T             long long
-#    define CURL_FMT_OFF_T         "lld"
-#    define CURL_FMT_OFF_TU        "llu"
-#    define CURL_FORMAT_OFF_T      "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              long long
+#    define CURL_FMT_OFF_T          "lld"
+#    define CURL_FMT_OFF_TU         "llu"
+#    define CURL_FORMAT_OFF_T       "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  LL
+#    define CURL_SUFFIX_CURL_OFF_TU uLL
 #  endif
 
 #elif defined(__MVS__)
 #  if defined(__IBMC__) || defined(__IBMCPP__)
 #    if defined(_LONG_LONG)
-#      define CURL_OFF_T             long long
-#      define CURL_FMT_OFF_T         "lld"
-#      define CURL_FMT_OFF_TU        "llu"
-#      define CURL_FORMAT_OFF_T      "%lld"
-#      define CURL_SIZEOF_CURL_OFF_T 8
+#      define CURL_OFF_T              long long
+#      define CURL_FMT_OFF_T          "lld"
+#      define CURL_FMT_OFF_TU         "llu"
+#      define CURL_FORMAT_OFF_T       "%lld"
+#      define CURL_SIZEOF_CURL_OFF_T  8
+#      define CURL_SUFFIX_CURL_OFF_T  LL
+#      define CURL_SUFFIX_CURL_OFF_TU uLL
 #    elif defined(_LP64)
-#      define CURL_OFF_T             long
-#      define CURL_FMT_OFF_T         "ld"
-#      define CURL_FMT_OFF_TU        "lu"
-#      define CURL_FORMAT_OFF_T      "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T 8
+#      define CURL_OFF_T              long
+#      define CURL_FMT_OFF_T          "ld"
+#      define CURL_FMT_OFF_TU         "lu"
+#      define CURL_FORMAT_OFF_T       "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T  8
+#      define CURL_SUFFIX_CURL_OFF_T  L
+#      define CURL_SUFFIX_CURL_OFF_TU uL
 #    else
-#      define CURL_OFF_T             long
-#      define CURL_FMT_OFF_T         "ld"
-#      define CURL_FMT_OFF_TU        "lu"
-#      define CURL_FORMAT_OFF_T      "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T 4
+#      define CURL_OFF_T              long
+#      define CURL_FMT_OFF_T          "ld"
+#      define CURL_FMT_OFF_TU         "lu"
+#      define CURL_FORMAT_OFF_T       "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T  4
+#      define CURL_SUFFIX_CURL_OFF_T  L
+#      define CURL_SUFFIX_CURL_OFF_TU uL
 #    endif
 #  endif
 
 #elif defined(__370__)
 #  if defined(__IBMC__) || defined(__IBMCPP__)
 #    if defined(_LONG_LONG)
-#      define CURL_OFF_T             long long
-#      define CURL_FMT_OFF_T         "lld"
-#      define CURL_FMT_OFF_TU        "llu"
-#      define CURL_FORMAT_OFF_T      "%lld"
-#      define CURL_SIZEOF_CURL_OFF_T 8
+#      define CURL_OFF_T              long long
+#      define CURL_FMT_OFF_T          "lld"
+#      define CURL_FMT_OFF_TU         "llu"
+#      define CURL_FORMAT_OFF_T       "%lld"
+#      define CURL_SIZEOF_CURL_OFF_T  8
+#      define CURL_SUFFIX_CURL_OFF_T  LL
+#      define CURL_SUFFIX_CURL_OFF_TU uLL
 #    elif defined(_LP64)
-#      define CURL_OFF_T             long
-#      define CURL_FMT_OFF_T         "ld"
-#      define CURL_FMT_OFF_TU        "lu"
-#      define CURL_FORMAT_OFF_T      "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T 8
+#      define CURL_OFF_T              long
+#      define CURL_FMT_OFF_T          "ld"
+#      define CURL_FMT_OFF_TU         "lu"
+#      define CURL_FORMAT_OFF_T       "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T  8
+#      define CURL_SUFFIX_CURL_OFF_T  L
+#      define CURL_SUFFIX_CURL_OFF_TU uL
 #    else
-#      define CURL_OFF_T             long
-#      define CURL_FMT_OFF_T         "ld"
-#      define CURL_FMT_OFF_TU        "lu"
-#      define CURL_FORMAT_OFF_T      "%ld"
-#      define CURL_SIZEOF_CURL_OFF_T 4
+#      define CURL_OFF_T              long
+#      define CURL_FMT_OFF_T          "ld"
+#      define CURL_FMT_OFF_TU         "lu"
+#      define CURL_FORMAT_OFF_T       "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T  4
+#      define CURL_SUFFIX_CURL_OFF_T  L
+#      define CURL_SUFFIX_CURL_OFF_TU uL
 #    endif
 #  endif
 
@@ -351,17 +407,21 @@
 
 #elif defined(__GNUC__)
 #  if defined(__i386__)
-#    define CURL_OFF_T             long long
-#    define CURL_FMT_OFF_T         "lld"
-#    define CURL_FMT_OFF_TU        "llu"
-#    define CURL_FORMAT_OFF_T      "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              long long
+#    define CURL_FMT_OFF_T          "lld"
+#    define CURL_FMT_OFF_TU         "llu"
+#    define CURL_FORMAT_OFF_T       "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  LL
+#    define CURL_SUFFIX_CURL_OFF_TU uLL
 #  elif defined(__x86_64__)
-#    define CURL_OFF_T             long
-#    define CURL_FMT_OFF_T         "ld"
-#    define CURL_FMT_OFF_TU        "lu"
-#    define CURL_FORMAT_OFF_T      "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T 8
+#    define CURL_OFF_T              long
+#    define CURL_FMT_OFF_T          "ld"
+#    define CURL_FMT_OFF_TU         "lu"
+#    define CURL_FORMAT_OFF_T       "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T  8
+#    define CURL_SUFFIX_CURL_OFF_T  L
+#    define CURL_SUFFIX_CURL_OFF_TU uL
 #  endif
 
 #else
diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in
index cc4d77eb8..7ed27f7a7 100644
--- a/include/curl/curlbuild.h.in
+++ b/include/curl/curlbuild.h.in
@@ -126,4 +126,10 @@ typedef CURL_OFF_T curl_off_t;
 /* The expected size of curl_off_t, as to be computed by sizeof. */
 #undef CURL_SIZEOF_CURL_OFF_T
 
+/* curl_off_t constant suffix. */
+#undef CURL_SUFFIX_CURL_OFF_T
+
+/* unsigned curl_off_t constant suffix. */
+#undef CURL_SUFFIX_CURL_OFF_TU
+
 #endif /* __CURL_CURLBUILD_H */