diff options
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/capture-pcap-util-unix.c | 14 | ||||
| -rw-r--r-- | caputils/capture-pcap-util.h | 14 | ||||
| -rw-r--r-- | caputils/capture_wpcap_packet.c | 14 |
3 files changed, 3 insertions, 39 deletions
diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c index 5d57a02797..7f0df9ec9a 100644 --- a/caputils/capture-pcap-util-unix.c +++ b/caputils/capture-pcap-util-unix.c @@ -26,19 +26,7 @@ #ifdef HAVE_LIBPCAP -#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> #ifdef __APPLE__ #include <dlfcn.h> diff --git a/caputils/capture-pcap-util.h b/caputils/capture-pcap-util.h index 87a05e8283..22fb723cf8 100644 --- a/caputils/capture-pcap-util.h +++ b/caputils/capture-pcap-util.h @@ -29,19 +29,7 @@ extern "C" { #ifdef HAVE_LIBPCAP -#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" diff --git a/caputils/capture_wpcap_packet.c b/caputils/capture_wpcap_packet.c index 6d1b77cb11..eac5ca7c5d 100644 --- a/caputils/capture_wpcap_packet.c +++ b/caputils/capture_wpcap_packet.c @@ -30,19 +30,7 @@ #include <glib.h> #include <gmodule.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> /* XXX - yes, I know, I should move cppmagic.h to a generic location. */ #include "tools/lemon/cppmagic.h" |