aboutsummaryrefslogtreecommitdiffstats
path: root/caputils/capture-pcap-util.c
diff options
context:
space:
mode:
authorTomasz Moń <desowin@gmail.com>2019-09-15 11:25:18 +0200
committerPeter Wu <peter@lekensteyn.nl>2019-09-21 08:51:34 +0000
commit893a2d9c62e8dcc4fe0f43c47e01743136f55386 (patch)
treed42803e115b676b08c0a659df75390554d2b53b9 /caputils/capture-pcap-util.c
parent29be7f9d9a6452a63cb22c425ac1c56d1f99f10d (diff)
MSVC: Warn about unused formal parameters
Provide _U_ macro definition for Visual Studio. Change the way _U_ macro is ifdefed for some targets to allow Visual Studio to recognize it. Ping-Bug: 15832 Change-Id: Ic7ce145cbe9e8aa751d64c9c09ce8ba6c1bbbd30 Reviewed-on: https://code.wireshark.org/review/34530 Tested-by: Petri Dish Buildbot Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'caputils/capture-pcap-util.c')
-rw-r--r--caputils/capture-pcap-util.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c
index 80304011d1..4a743558bc 100644
--- a/caputils/capture-pcap-util.c
+++ b/caputils/capture-pcap-util.c
@@ -823,12 +823,13 @@ linktype_name_to_val(const char *linktype)
* rest-of-the-universe libpcap.
*/
int
-get_pcap_datalink(pcap_t *pch, const char *devicename
-#ifndef _AIX
- _U_)
+get_pcap_datalink(pcap_t *pch,
+#ifdef _AIX
+ const char* devicename
#else
- )
+ const char* devicename _U_
#endif
+ )
{
int datalink;
#ifdef _AIX
@@ -1257,11 +1258,11 @@ get_if_capabilities_pcap_create(interface_options *interface_opts,
}
pcap_t *
-open_capture_device_pcap_create(capture_options *capture_opts
+open_capture_device_pcap_create(
#if defined(HAVE_PCAP_SET_TSTAMP_PRECISION) || defined (HAVE_PCAP_SET_TSTAMP_TYPE)
- ,
+ capture_options* capture_opts,
#else
- _U_,
+ capture_options* capture_opts _U_,
#endif
interface_options *interface_opts, int timeout,
cap_device_open_err *open_err,