From 98024a007f590ed79ce43b89bcf7287ea240b989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
Date: Tue, 6 Oct 2009 16:01:18 +0000
Subject: Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_H Rename
 getopt.[ch] -> wsgetopt.[ch] to avoid name collision.

svn path=/trunk/; revision=30370
---
 mergecap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mergecap.c')

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;
-- 
cgit v1.2.3