diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-06 16:01:18 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-06 16:01:18 +0000 |
| commit | 98024a007f590ed79ce43b89bcf7287ea240b989 (patch) | |
| tree | 0dc184c467bbca781c4d7a049ab14a67b4e5cfea /gtk/main.c | |
| parent | c88f493d4d1d07933339ffe17d33a0ccfcc8cc32 (diff) | |
| download | wireshark-98024a007f590ed79ce43b89bcf7287ea240b989.tar.gz wireshark-98024a007f590ed79ce43b89bcf7287ea240b989.tar.bz2 wireshark-98024a007f590ed79ce43b89bcf7287ea240b989.zip | |
Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H
Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision.
svn path=/trunk/; revision=30370
Diffstat (limited to 'gtk/main.c')
| -rw-r--r-- | gtk/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/main.c b/gtk/main.c index dfdb3713bc..e7550ce963 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -45,8 +45,10 @@ #include "strerror.h" #endif -#ifdef NEED_GETOPT_H -#include "getopt.h" +#ifdef HAVE_GETOPT_H +#include <getopt.h> +#else +#include "wsgetopt.h" #endif #ifdef _WIN32 /* Needed for console I/O */ @@ -1816,7 +1818,6 @@ main(int argc, char *argv[]) char *init_progfile_dir_error; char *s; int opt; - extern char *optarg; gboolean arg_error = FALSE; extern int splash_register_freq; /* Found in about_dlg.c */ |