diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-29 08:19:16 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-29 08:19:16 +0000 |
| commit | 1dab34c905046071887a4d60a485557f9c8ea2ef (patch) | |
| tree | 299703c1698e53face180bdf414deefb4de209bb /capture-wpcap.c | |
| parent | 4d0b8d190a9fe56ac2e3d805f8d9432612542a64 (diff) | |
We require WinPcap > 3.0 so get rid of WPCAP_CONSTIFIED_CONFIG
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29616 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture-wpcap.c')
| -rw-r--r-- | capture-wpcap.c | 14 |
1 files changed, 0 insertions, 14 deletions
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); |