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, 5 deletions

diff --git a/randpkt.c b/randpkt.c
index 2d92d95ea6..a018265112 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -27,8 +27,10 @@
 #include "config.h"
 #endif
 
-#ifdef NEED_GETOPT_H
-#include "getopt.h"
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "wsgetopt.h"
 #endif
 
 #ifdef HAVE_UNISTD_H
@@ -500,9 +502,6 @@ main(int argc, char **argv)
 	guint8			buffer[65536];
 
 	int			opt;
-	extern char		*optarg;
-	extern int		optind;
-
 	int			produce_count = 1000; /* number of pkts to produce */
 	int			produce_type = PKT_ETHERNET;
 	char			*produce_filename = NULL;