diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-06-24 21:16:22 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-06-24 21:16:22 +0000 |
| commit | 48c21706f2cc3c94f9c4e7e4178c1b65d46662c6 (patch) | |
| tree | 60cc1c723684e959f0a1efdea5712607b26428c3 /config.nmake | |
| parent | 38d6dc43a48e844657228bb8a2d4a6310cd29f63 (diff) | |
| download | wireshark-48c21706f2cc3c94f9c4e7e4178c1b65d46662c6.tar.gz wireshark-48c21706f2cc3c94f9c4e7e4178c1b65d46662c6.tar.bz2 wireshark-48c21706f2cc3c94f9c4e7e4178c1b65d46662c6.zip | |
Add TurboCap-related changes from /trunk-1.0:
From Dustin Johnson: Add support for TurboCap.
- packet-ppi.c: Add aggregation and 802.3 extended information.
- capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.
Make pcap_list_datalinks and pcap_set_datalink mandatory on Windows.
svn path=/trunk/; revision=25593
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index bdb67ba8ba..bca6266a63 100644 --- a/config.nmake +++ b/config.nmake @@ -668,6 +668,9 @@ PCAP_BREAKLOOP_CONFIG= WPCAP_CONSTIFIED= !ENDIF +PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1 +PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1 + !IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE) PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1 PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1 |