Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H

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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30370 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 4 insertions, 4 deletions

diff --git a/editcap.c b/editcap.c
index b401066535..5937cbac37 100644
--- a/editcap.c
+++ b/editcap.c
@@ -42,8 +42,10 @@
 
 #include "wtap.h"
 
-#ifdef NEED_GETOPT_H
-#include "getopt.h"
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "wsgetopt.h"
 #endif
 
 #ifdef _WIN32
@@ -672,8 +674,6 @@ main(int argc, char *argv[])
   wtap *wth;
   int i, j, err;
   gchar *err_info;
-  extern char *optarg;
-  extern int optind;
   int opt;
   char *p;
   unsigned int snaplen = 0;             /* No limit               */