diff options
| author | Tomasz Moń <desowin@gmail.com> | 2019-04-29 14:52:17 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-04-29 16:34:31 +0000 |
| commit | 7a6b6631c853412f5405fe6ca571790e23a4025c (patch) | |
| tree | 5cbfc459571aa18599ee87204be9071d9c7e9e63 /caputils | |
| parent | af72ba7e84ca85bc5ea57c3c88b70398a83dbb0f (diff) | |
caputils: Fix endless recursive loop on Windows
The functions loaded from dll are prefixed with "p_".
Use the dll functions where appropriate.
Change-Id: I7cf2c7dc0d04502fa7f922ca2822808bdc02f324
Reviewed-on: https://code.wireshark.org/review/33010
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/capture-wpcap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 25129361db..7c8971e77d 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -500,20 +500,20 @@ pcap_set_rfmon(pcap_t *a, int b) int pcap_set_timeout(pcap_t *a, int b) { - g_assert(has_wpcap && pcap_set_timeout != NULL); + g_assert(has_wpcap && p_pcap_set_timeout != NULL); return p_pcap_set_timeout(a, b); } int pcap_set_buffer_size(pcap_t *a, int b) { - g_assert(has_wpcap && pcap_set_timeout != NULL); + g_assert(has_wpcap && p_pcap_set_buffer_size != NULL); return p_pcap_set_buffer_size(a, b); } int pcap_activate(pcap_t *a) { - g_assert(has_wpcap && pcap_activate != NULL); + g_assert(has_wpcap && p_pcap_activate != NULL); return p_pcap_activate(a); } @@ -524,8 +524,8 @@ pcap_statustostr(int a) static char ebuf[15 + 10 + 1]; g_assert(has_wpcap); - if (pcap_statustostr != NULL) { - return pcap_statustostr(a); + if (p_pcap_statustostr != NULL) { + return p_pcap_statustostr(a); } /* XXX copy routine from pcap.c ??? */ |