diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-10 09:48:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-10 09:48:54 +0000 |
| commit | bd2ea47524fe1cb574cadbe9448ce918ee3d58e2 (patch) | |
| tree | 0c7c8669aefcea2eedb7451ef282073bdcfdc134 /config.h.win32 | |
| parent | e75b86fab1d1f5841046dc3dff1ae1fbb679d77b (diff) | |
| download | wireshark-bd2ea47524fe1cb574cadbe9448ce918ee3d58e2.tar.gz wireshark-bd2ea47524fe1cb574cadbe9448ce918ee3d58e2.tar.bz2 wireshark-bd2ea47524fe1cb574cadbe9448ce918ee3d58e2.zip | |
Configure whether we have WinPcap based on whether WINPCAP_VERSION is
set in the config.nmake file.
Configure whether we have pcap_findalldevs() based on whether
WINPCAP_VERSION is 2.3 (if so, we don't) or 3.0 or 3.1 (if so, we do).
WinPcap 3.0 has the new libpcap declarations of "pcap_lookupnet()" and
"pcap_open_live()" in which the first argument is a "const char *"
rather than a "char *"; declare the functions and pointers to them
appropriately based on the version of WinPcap.
If we don't have pcap_findalldevs(), don't declare a pointer to it, as
we don't have a declaration of pcap_if_t.
We also need to refer to "pcap_freealldevs()", so make a pointer for it.
"symbols[]" is a const array; make the pointer to elements in it a const
pointer.
Fix some typoes.
svn path=/trunk/; revision=8660
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config.h.win32 b/config.h.win32 index 15b1380ff6..c578948398 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.40 2003/06/12 09:45:42 guy Exp $ */ +/* $Id: config.h.win32,v 1.41 2003/10/10 09:48:54 guy Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -41,7 +41,9 @@ #define NEED_MKSTEMP 1 -#define HAVE_LIBPCAP 1 +@HAVE_LIBPCAP@ +@HAVE_PCAP_FINDALLDEVS@ +@WPCAP_CONSTIFIED@ #define HAVE_NET_SNMP 1 #define HAVE_SOME_SNMP 1 |