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 /mergecap.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 'mergecap.c')
| -rw-r--r-- | mergecap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mergecap.c b/mergecap.c index 2f493c895e..bf58298cca 100644 --- a/mergecap.c +++ b/mergecap.c @@ -27,8 +27,10 @@ #include <string.h> #include "wtap.h" -#ifdef NEED_GETOPT_H -#include "getopt.h" +#ifdef HAVE_GETOPT_H +#include <getopt.h> +#else +#include "wsgetopt.h" #endif #include "svnversion.h" @@ -140,8 +142,6 @@ static void list_encap_types(void) { int main(int argc, char *argv[]) { - extern char *optarg; - extern int optind; int opt; gboolean do_append = FALSE; gboolean verbose = FALSE; |