Ethereal-cvs: [Ethereal-cvs] cvs commit: ethereal Makefile.nmake capture-wpcap.c config.h.win3
guy 2003/10/10 04:48:54 CDT
Modified files:
. Makefile.nmake capture-wpcap.c
config.h.win32 config.nmake
Log:
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.
Revision Changes Path
1.345 +7 -2 ethereal/Makefile.nmake
1.6 +31 -4 ethereal/capture-wpcap.c
1.41 +4 -2 ethereal/config.h.win32
1.60 +19 -1 ethereal/config.nmake