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 /rawshark.c | |
| parent | c88f493d4d1d07933339ffe17d33a0ccfcc8cc32 (diff) | |
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 'rawshark.c')
| -rw-r--r-- | rawshark.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rawshark.c b/rawshark.c index 794e2a173a..247cafbc3c 100644 --- a/rawshark.c +++ b/rawshark.c @@ -65,8 +65,10 @@ #include "strerror.h" #endif -#ifdef NEED_GETOPT_H -#include "getopt.h" +#ifdef HAVE_GETOPT_H +#include <getopt.h> +#else +#include "wsgetopt.h" #endif #include <glib.h> @@ -428,7 +430,6 @@ main(int argc, char *argv[]) { char *init_progfile_dir_error; int opt, i; - extern char *optarg; gboolean arg_error = FALSE; #ifdef _WIN32 |