[svn] Renamed strtoll_return to strtoll_type.

diff --git a/src/ChangeLog b/src/ChangeLog
index 48d12c3a1de4e55e001df68ea3f9dfa483a72722..79140d29552a04bf706a7e790cea481e6fda5491 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-12  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * wget.h: Renamed strtoll_return to strtoll_type.
+
 2005-08-11  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * progress.c (eta_to_human_short): Switch to days when printing

diff --git a/src/cmpt.c b/src/cmpt.c
index 08a92aefadab9b75f4c69809e98c46bad5d9f3fc..37b3e7b4b6c549d8eecd9c47af590c774589021a 100644 (file)
--- a/src/cmpt.c
+++ b/src/cmpt.c
@@ -1296,9 +1296,9 @@ char_value (char c, int base)
   return value;
 }
 
-#define LL strtoll_return      /* long long or __int64 */
+#define LL strtoll_type                /* long long or __int64 */
 
-/* These constants assume 64-bit strtoll_return. */
+/* These constants assume 64-bit strtoll_type. */
 
 /* A roundabout way of writing 2**63-1 = 9223372036854775807 */
 #define STRTOLL_OVERFLOW (((LL) 1 << 62) - 1 + ((LL) 1 << 62))
@@ -1306,13 +1306,13 @@ char_value (char c, int base)
 #define STRTOLL_UNDERFLOW (-STRTOLL_OVERFLOW - 1)
 
 /* A strtoll replacement for systems that have LFS but don't supply
-   strtoll.  The headers typedef strtoll_return to long long or to
+   strtoll.  The headers typedef strtoll_type to long long or to
    __int64.  */
 
-strtoll_return
+strtoll_type
 strtoll (const char *nptr, char **endptr, int base)
 {
-  strtoll_return result = 0;
+  strtoll_type result = 0;
   bool negative;
 
   if (base != 0 && (base < 2 || base > 36))
@@ -1360,7 +1360,7 @@ strtoll (const char *nptr, char **endptr, int base)
       int val;
       for (; (val = char_value (*nptr, base)) != -1; ++nptr)
        {
-         strtoll_return newresult = base * result + val;
+         strtoll_type newresult = base * result + val;
          if (newresult < result)
            {
              result = STRTOLL_OVERFLOW;
@@ -1376,7 +1376,7 @@ strtoll (const char *nptr, char **endptr, int base)
       int val;
       for (; (val = char_value (*nptr, base)) != -1; ++nptr)
        {
-         strtoll_return newresult = base * result - val;
+         strtoll_type newresult = base * result - val;
          if (newresult > result)
            {
              result = STRTOLL_UNDERFLOW;

diff --git a/src/mswindows.h b/src/mswindows.h
index 0799b8319f3d0b2b09d60433691cf32e0f0a91e4..8b9330b0be2d701488179e8973918b86ed4fbace 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -95,7 +95,7 @@ typedef __int64 wgint;
 #else
 # define str_to_wgint strtoll
 # define NEED_STRTOLL
-# define strtoll_return __int64
+# define strtoll_type __int64
 #endif
 
 /* Windows has no symlink, therefore no lstat.  Without symlinks lstat

diff --git a/src/wget.h b/src/wget.h
index c312471d0b391b479ce5a3d4003dd21ff93ab4c6..88665d32933942980ea2dd9b22b654ab49b56cab 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -125,10 +125,8 @@ so, delete this exception statement from your version.  */
 #ifndef WINDOWS
 typedef off_t wgint;
 # define SIZEOF_WGINT SIZEOF_OFF_T
-#endif
 
-/* Define a strtol/strtoll clone that works with wgint.  */
-#ifndef str_to_wgint           /* mswindows.h defines its own alias */
+/* Pick the strtol-like function that will work with wgint.  */
 # if SIZEOF_WGINT == SIZEOF_LONG
 #  define str_to_wgint strtol
 #  define WGINT_MAX LONG_MAX
@@ -136,22 +134,22 @@ typedef off_t wgint;
 #  define WGINT_MAX LLONG_MAX
 #  ifdef HAVE_STRTOLL
 #   define str_to_wgint strtoll
-#  elif HAVE_STRTOIMAX
+#  elif HAVE_STRTOIMAX         /* HPUX 11.0 has strtoimax, but no strtoll */
 #   define str_to_wgint strtoimax
 #  else
 #   define str_to_wgint strtoll
 #   define NEED_STRTOLL
-#   define strtoll_return long long
+#   define strtoll_type long long
 #  endif
 # endif
-#endif
+#endif /* not WINDOWS */
 
 /* Declare our strtoll replacement. */
 #ifdef NEED_STRTOLL
-strtoll_return strtoll (const char *, char **, int);
+strtoll_type strtoll (const char *, char **, int);
 #endif
 
-/* Now define a large integral type useful for storing sizes of *sums*
+/* Now define a large numeric type useful for storing sizes of *sums*
    of downloads, such as the value of the --quota option.  This should
    be a type able to hold 2G+ values even on systems without large
    file support.  (It is useful to limit Wget's download quota to say