Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H

Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision.

svn path=/trunk/; revision=30370

1 files changed, 4 insertions, 3 deletions

diff --git a/tshark.c b/tshark.c
index 3cef9e486c..b925efcab1 100644
--- a/tshark.c
+++ b/tshark.c
@@ -55,8 +55,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>
@@ -733,7 +735,6 @@ main(int argc, char *argv[])
 {
   char                *init_progfile_dir_error;
   int                  opt;
-  extern char         *optarg;
   gboolean             arg_error = FALSE;
 
 #ifdef _WIN32