[svn] Remove the OPTIONS_DEFINED_HERE kludge.

Published in <sxs4rijqmhv.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8ab7caf4a64d1b1d588cdaa624d47c3ce95b6012..4605cad2b15f5c99e06afb817631674e12e77cd0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-10  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * wget.h: Ditto for extern char *exec_name.
+
+       * options.h: Don't guard against OPTIONS_DEFINED_HERE -- it is
+       perfectly legal to follow an `extern' with a non-`extern' ones,
+       provided the types match.
+
+       * main.c: Don't define OPTIONS_DEFINED_HERE.
+
 2002-04-10  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * progress.c (create_image): Revert to calculating ETA based on

diff --git a/src/main.c b/src/main.c
index aef78bf5d6851ddb23a3218d8c69b581f0ffc881..a08748bb5e9253ae9e3238d9f5950042594496cb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -41,8 +41,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif /* HAVE_NLS */
 #include <errno.h>
 
-#define OPTIONS_DEFINED_HERE   /* for options.h */
-
 #include "wget.h"
 #include "utils.h"
 #include "init.h"

diff --git a/src/options.h b/src/options.h
index d330021868fcea7f99c962622292ce1411aec594..ae66d8e235273a52d9f1f4984b934edfd2f40734 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -166,6 +166,4 @@ struct options
   char *cookies_output;
 };
 
-#ifndef OPTIONS_DEFINED_HERE
 extern struct options opt;
-#endif

diff --git a/src/wget.h b/src/wget.h
index e9191387a561dff2f6d217810eae0982ed1a4c2d..58ca27342855baff6ac159a9e0e17956ce891893 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -264,15 +264,7 @@ char *xstrdup_debug PARAMS ((const char *, const char *, int));
 /* Free FOO if it is non-NULL.  */
 #define FREE_MAYBE(foo) do { if (foo) xfree (foo); } while (0)
 
-/* #### Hack: OPTIONS_DEFINED_HERE is defined in main.c.  */
-/* [Is this weird hack really necessary on any compilers?  No ANSI C compiler
-    should complain about "extern const char *exec_name;" followed by
-    "const char *exec_name;".  Are we doing this for K&R compilers, or...??
-    -- Dan Harkless <wget@harkless.org>] */
-#ifndef OPTIONS_DEFINED_HERE
 extern const char *exec_name;
-#endif
-
 \f
 /* Document type ("dt") flags */
 enum