From: hniksic <devnull@localhost>
Date: Wed, 10 Apr 2002 21:20:55 +0000 (-0700)
Subject: [svn] Remove the OPTIONS_DEFINED_HERE kludge.
X-Git-Tag: v1.13~1820
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=8c3287dabfcd03c2bbd4c342dd4b8c036a845d53

[svn] Remove the OPTIONS_DEFINED_HERE kludge.
Published in <sxs4rijqmhv.fsf@florida.arsdigita.de>.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8ab7caf4..4605cad2 100644
--- 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 aef78bf5..a08748bb 100644
--- 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 d3300218..ae66d8e2 100644
--- 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 e9191387..58ca2734 100644
--- 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
-
 
 /* Document type ("dt") flags */
 enum