diff options
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | capture-wpcap.c | 14 | ||||
| -rw-r--r-- | config.h.win32 | 1 | ||||
| -rw-r--r-- | config.nmake | 2 |
4 files changed, 0 insertions, 18 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index b3ab32cef4..013abaab2f 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -361,7 +361,6 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_PCAP_CREATESRCSTR@/$(PCAP_CREATESRCSTR_CONFIG)/" \ -e "s/@HAVE_PCAP_SETSAMPLING@/$(PCAP_SETSAMPLING_CONFIG)/" \ -e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \ - -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \ -e "s/@HAVE_LIBGNUTLS@/$(GNUTLS_CONFIG)/" \ -e "s/@HAVE_LIBGCRYPT@/$(LIBGCRYPT_CONFIG)/" \ -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \ diff --git a/capture-wpcap.c b/capture-wpcap.c index 3e4198f207..8f7815488c 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -64,15 +64,9 @@ static int (*p_pcap_setfilter) (pcap_t *, struct bpf_program *); static char* (*p_pcap_geterr) (pcap_t *); static int (*p_pcap_compile) (pcap_t *, struct bpf_program *, const char *, int, bpf_u_int32); -#ifdef WPCAP_CONSTIFIED static int (*p_pcap_lookupnet) (const char *, bpf_u_int32 *, bpf_u_int32 *, char *); static pcap_t* (*p_pcap_open_live) (const char *, int, int, int, char *); -#else -static int (*p_pcap_lookupnet) (char *, bpf_u_int32 *, bpf_u_int32 *, - char *); -static pcap_t* (*p_pcap_open_live) (char *, int, int, int, char *); -#endif static int (*p_pcap_loop) (pcap_t *, int, pcap_handler, guchar *); static void (*p_pcap_freecode) (struct bpf_program *); #ifdef HAVE_PCAP_FINDALLDEVS @@ -290,22 +284,14 @@ pcap_compile(pcap_t *a, struct bpf_program *b, const char *c, int d, } int -#ifdef WPCAP_CONSTIFIED pcap_lookupnet(const char *a, bpf_u_int32 *b, bpf_u_int32 *c, char *d) -#else -pcap_lookupnet(char *a, bpf_u_int32 *b, bpf_u_int32 *c, char *d) -#endif { g_assert(has_wpcap); return p_pcap_lookupnet(a, b, c, d); } pcap_t* -#ifdef WPCAP_CONSTIFIED pcap_open_live(const char *a, int b, int c, int d, char *e) -#else -pcap_open_live(char *a, int b, int c, int d, char *e) -#endif { g_assert(has_wpcap); return p_pcap_open_live(a, b, c, d, e); diff --git a/config.h.win32 b/config.h.win32 index 5b04308131..ec104a395e 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -64,7 +64,6 @@ @HAVE_PCAP_FINDALLDEVS@ @HAVE_PCAP_DATALINK_NAME_TO_VAL@ @HAVE_PCAP_DATALINK_VAL_TO_NAME@ -@WPCAP_CONSTIFIED@ @HAVE_LIBWIRESHARKDLL@ @HAVE_PCAP_LIST_DATALINKS@ diff --git a/config.nmake b/config.nmake index 2d5d343560..e8a9d7184c 100644 --- a/config.nmake +++ b/config.nmake @@ -966,7 +966,6 @@ PCAP_DATALINK_NAME_TO_VAL_CONFIG=^#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1 PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1 # PCAP_BREAKLOOP won't have any benefit on Win32, but breaks compatibility with 3.0 PCAP_BREAKLOOP_CONFIG= -WPCAP_CONSTIFIED_CONFIG=^#define WPCAP_CONSTIFIED 1 !ELSE # no WpdPack installed WINPCAP_CONFIG= @@ -974,7 +973,6 @@ PCAP_FINDALLDEVS_CONFIG= PCAP_DATALINK_NAME_TO_VAL_CONFIG= PCAP_DATALINK_VAL_TO_NAME_CONFIG= PCAP_BREAKLOOP_CONFIG= -WPCAP_CONSTIFIED= !ENDIF PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1 |