diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2005-05-25 21:37:46 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2005-05-25 21:37:46 +0000 |
commit | a3d36ae03184c1addf1fbddcb50a8a39919866c4 (patch) | |
tree | a84a1d86c5f450b28ebb40e719c808a733e177ee /capture-wpcap.c | |
parent | a67a1fb29bfc1f77738b9fafd20377a1358bae82 (diff) |
add const to pcap_next_ex() parameter, as WinPcap 3.1 beta 4 (and libpcap 0.8) requires it
svn path=/trunk/; revision=14434
Diffstat (limited to 'capture-wpcap.c')
-rw-r--r-- | capture-wpcap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/capture-wpcap.c b/capture-wpcap.c index 1505f5ff8d..1abe96de77 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -78,7 +78,7 @@ static const char *(*p_pcap_datalink_val_to_name) (int); #endif static const char *(*p_pcap_lib_version) (void); static int (*p_pcap_setbuff) (pcap_t *, int dim); -static int (*p_pcap_next_ex) (pcap_t *, struct pcap_pkthdr **pkt_header, u_char **pkt_data); +static int (*p_pcap_next_ex) (pcap_t *, struct pcap_pkthdr **pkt_header, const u_char **pkt_data); typedef struct { const char *name; @@ -422,8 +422,9 @@ int pcap_setbuff(pcap_t *a, int b) return p_pcap_setbuff(a, b); } -/* next_ex is win32 specific! */ -int pcap_next_ex (pcap_t *a, struct pcap_pkthdr **b, u_char **c) +/* pcap_next_ex is available since libpcap 0.8 / WinPcap 3.0! */ +/* (if you get a declaration warning here, try to update to at least WinPcap 3.1b4 develpack) */ +int pcap_next_ex (pcap_t *a, struct pcap_pkthdr **b, const u_char **c) { g_assert(has_wpcap); return p_pcap_next_ex(a, b, c); |