From 7321183716f1e6e28584ea356b0782b06f330fe5 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 11 May 2017 12:57:28 -0700
Subject: Put the HAVE_REMOTE hack into wsutil/wspcap.h, and include that file.

Have a header file that defines HAVE_REMOTE if HAVE_PCAP_REMOTE is
defined, and then includes pcap.h.  Replace all other includes of
pcap.h, and the definition of HAVE_REMOTE, with includes of that file.
Check for anything other than wspcap.h including pcap.h in checkAPIs.pl.

Change-Id: I3cbee8208944ad6f006f568b3fe3134e10b2a883
Reviewed-on: https://code.wireshark.org/review/21605
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 ui/qt/capture_filter_syntax_worker.cpp | 14 +-------------
 ui/qt/compiled_filter_output.cpp       | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'ui/qt')

diff --git a/ui/qt/capture_filter_syntax_worker.cpp b/ui/qt/capture_filter_syntax_worker.cpp
index a296f89c51..dc3edbfe0c 100644
--- a/ui/qt/capture_filter_syntax_worker.cpp
+++ b/ui/qt/capture_filter_syntax_worker.cpp
@@ -24,19 +24,7 @@
 #ifdef HAVE_LIBPCAP
 #include <glib.h>
 
-#ifdef HAVE_PCAP_REMOTE
-/*
- * Force the WinPcap header files to define things required for remote
- * capture.  (Yes, this is q WinPcap bug; if your project has a public
- * header file that checks or otherwise uses a #define that's defined
- * by your project's configuration process, and don't ensure that
- * it's always defined appropriately when that header file is included,
- * before its first use, you have made a mistake.)
- */
-#define HAVE_REMOTE
-#endif
-
-#include <pcap.h>
+#include <wsutil/wspcap.h>
 
 #include "capture_opts.h"
 #include "ui/capture_globals.h"
diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
index c78ab713ac..a234123b62 100644
--- a/ui/qt/compiled_filter_output.cpp
+++ b/ui/qt/compiled_filter_output.cpp
@@ -23,19 +23,7 @@
 #include <ui_compiled_filter_output.h>
 #include "compiled_filter_output.h"
 
-#ifdef HAVE_PCAP_REMOTE
-/*
- * Force the WinPcap header files to define things required for remote
- * capture.  (Yes, this is q WinPcap bug; if your project has a public
- * header file that checks or otherwise uses a #define that's defined
- * by your project's configuration process, and don't ensure that
- * it's always defined appropriately when that header file is included,
- * before its first use, you have made a mistake.)
- */
-#define HAVE_REMOTE
-#endif
-
-#include <pcap.h>
+#include <wsutil/wspcap.h>
 
 #include "capture_opts.h"
 #include <wiretap/wtap.h>
-- 
cgit v1.2.1