diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-06 20:41:51 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-07 04:44:38 +0000 |
commit | b2bf9e3306d34987dfb7928964931088c2224b92 (patch) | |
tree | 0966fec04a2000e271d91249e7bb548d78fba72f /config.nmake | |
parent | ba3aa03dcfb49a3bb2b090b864f1311fa4ecbc0e (diff) | |
download | wireshark-b2bf9e3306d34987dfb7928964931088c2224b92.tar.gz |
Set both HAVE_PCAP_CREATE and HAVE_PCAP_OPEN.
The latest WinPcap has both pcap_open() and pcap_create(), and the
latter is independent of whether we have remote capture.
Change-Id: I889555b74b0c15d5519a8d178719c938d374a938
Reviewed-on: https://code.wireshark.org/review/13094
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'config.nmake')
-rw-r--r-- | config.nmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index fb57a78854..d062488c54 100644 --- a/config.nmake +++ b/config.nmake @@ -1585,6 +1585,7 @@ PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1 PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1 PCAP_OPEN_DEAD_CONFIG=^#define HAVE_PCAP_OPEN_DEAD 1 BPF_IMAGE_CONFIG=^#define HAVE_BPF_IMAGE 1 +PCAP_CREATE_CONFIG=^#define HAVE_PCAP_CREATE 1 !ELSE # no WpdPack installed WINPCAP_CONFIG= @@ -1603,9 +1604,7 @@ BPF_IMAGE_CONFIG= !IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE) PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1 PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1 -#PCAP_OPEN_CONFIG=^#define HAVE_PCAP_OPEN 1 -#Do not set, experimental. No interfaces shown if set. dumpcap.c needs changes. -PCAP_CREATE_CONFIG=^#define HAVE_PCAP_CREATE 1 +PCAP_OPEN_CONFIG=^#define HAVE_PCAP_OPEN 1 PCAP_SETSAMPLING_CONFIG=^#define HAVE_PCAP_SETSAMPLING 1 !ELSE PCAP_HAVE_REMOTE_CONFIG= |