[svn] cmd_bytes now stores wgint, not long.

diff --git a/src/ChangeLog b/src/ChangeLog
index 20180453ba3c55a018bd79a50c0eb6cf395b52c9..2bc2c55792f20459620d95958dba9c2308b2dec7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-12  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * wget.h: Include options.h after wgint has been defined.
+
+       * options.h (struct options): Declare options processed with
+       cmd_bytes as wgint, not long.
+
 2005-03-18  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * init.c (cmd_file): Use concat_strings.

diff --git a/src/options.h b/src/options.h
index 79c73958da8adf579f78702c777bc4a3cf490233..90f9fc3a1f95ba94a608feb5217764a3bda67fd7 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -110,7 +110,7 @@ struct options
   double waitretry;            /* The wait period between retries. - HEH */
   int use_robots;              /* Do we heed robots.txt? */
 
-  long limit_rate;             /* Limit the download rate to this
+  wgint limit_rate;            /* Limit the download rate to this
                                   many bps. */
   LARGE_INT quota;             /* Maximum file size to download and
                                   store. */
@@ -144,7 +144,7 @@ struct options
                                   listings? */
 
   char *dot_style;
-  long dot_bytes;              /* How many bytes in a printing
+  wgint dot_bytes;             /* How many bytes in a printing
                                   dot. */
   int dots_in_line;            /* How many dots in one line. */
   int dot_spacing;             /* How many dots between spacings. */

diff --git a/src/wget.h b/src/wget.h
index 1ac6eccb0ebdbdd018ec82756d592f0a28e3e533..aa133ccd540fc12dad60cba5536302922daca829 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -88,7 +88,6 @@ so, delete this exception statement from your version.  */
 
 /* Include these, so random files need not include them.  */
 #include "sysdep.h"
-#include "options.h"
 /* locale independent replacement for ctype.h */
 #include "safe-ctype.h"
 
@@ -125,6 +124,8 @@ typedef off_t wgint;
 # endif
 #endif
 
+#include "options.h"
+
 /* Everything uses this, so include them here directly.  */
 #include "xmalloc.h"