dect
/
libpcap
Archived
13
0
Fork 0

Merge branch 'libpcap_1.1' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/libpcap into libpcap_1.1

This commit is contained in:
Guy Harris 2010-04-01 10:47:10 -07:00
commit 07b1493b01
2 changed files with 6 additions and 2 deletions

View File

@ -24,6 +24,7 @@ Additional people who have contributed patches:
Charles M. Hannum <mycroft at netbsd dot org> Charles M. Hannum <mycroft at netbsd dot org>
Chris G. Demetriou <cgd at netbsd dot org> Chris G. Demetriou <cgd at netbsd dot org>
Chris Lightfoot <cwrl at users dot sourceforge dot net> Chris Lightfoot <cwrl at users dot sourceforge dot net>
Chris Maynard <Chris dot Maynard at gtech dot com>
Chris Pepper <pepper at mail dot reppep dot com> Chris Pepper <pepper at mail dot reppep dot com>
Christian Bell <csbell at myri dot com> Christian Bell <csbell at myri dot com>
Christian Peron <csjp at freebsd dot org> Christian Peron <csjp at freebsd dot org>

View File

@ -62,9 +62,12 @@ static const char rcsid[] _U_ =
#ifdef AF_PACKET #ifdef AF_PACKET
# ifdef __Lynx__ # ifdef __Lynx__
# include <netpacket/if_packet.h> /* LynxOS */ /* LynxOS */
# include <netpacket/if_packet.h>
# else # else
# include <linux/if_packet.h> /* Linux */ /* Linux */
# include <linux/types.h>
# include <linux/if_packet.h>
# endif # endif
#endif #endif