moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Remove the OPTIONS_DEFINED_HERE kludge.

Browse Source 
Published in <sxs4rijqmhv.fsf@florida.arsdigita.de>.
This commit is contained in:
hniksic 2002-04-10 14:20:55 -07:00
parent 1600aaeaa6
commit 8c3287dabf
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -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> 2002-04-10 Hrvoje Niksic <hniksic@arsdigita.com>
* progress.c (create_image): Revert to calculating ETA based on * progress.c (create_image): Revert to calculating ETA based on

2
src/main.c
View File

@ -41,8 +41,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#endif /* HAVE_NLS */ #endif /* HAVE_NLS */
#include <errno.h> #include <errno.h>
#define OPTIONS_DEFINED_HERE /* for options.h */
#include "wget.h" #include "wget.h"
#include "utils.h" #include "utils.h"
#include "init.h" #include "init.h"

2
src/options.h
View File

@ -166,6 +166,4 @@ struct options
char *cookies_output; char *cookies_output;
}; };
#ifndef OPTIONS_DEFINED_HERE
extern struct options opt; extern struct options opt;
#endif

8
src/wget.h
View File

@ -264,15 +264,7 @@ char *xstrdup_debug PARAMS ((const char *, const char *, int));
/* Free FOO if it is non-NULL. */ /* Free FOO if it is non-NULL. */
#define FREE_MAYBE(foo) do { if (foo) xfree (foo); } while (0) #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; extern const char *exec_name;
#endif
/* Document type ("dt") flags */ /* Document type ("dt") flags */
enum enum