Frederic Cambus <f...@statdns.com> writes: > Hi tech@, > > A few remaining duplicated includes to remove. > > Comments? OK?
ok except for ixgbe.h > Index: sys/arch/sparc64/include/asm.h > =================================================================== > RCS file: /cvs/src/sys/arch/sparc64/include/asm.h,v > retrieving revision 1.10 > diff -u -p -r1.10 asm.h > --- sys/arch/sparc64/include/asm.h 27 May 2016 16:32:39 -0000 1.10 > +++ sys/arch/sparc64/include/asm.h 22 Sep 2016 14:08:50 -0000 > @@ -41,11 +41,6 @@ > #ifndef _MACHINE_ASM_H_ > #define _MACHINE_ASM_H_ > > -#ifndef _LOCORE > -#define _LOCORE > -#endif > -#include <machine/frame.h> > - > /* Pull in CCFSZ, CC64FSZ, and BIAS from frame.h */ > #ifndef _LOCORE > #define _LOCORE > Index: sys/dev/pci/ixgbe.h > =================================================================== > RCS file: /cvs/src/sys/dev/pci/ixgbe.h,v > retrieving revision 1.22 > diff -u -p -r1.22 ixgbe.h > --- sys/dev/pci/ixgbe.h 15 Mar 2016 16:45:52 -0000 1.22 > +++ sys/dev/pci/ixgbe.h 22 Sep 2016 14:08:51 -0000 > @@ -62,10 +62,6 @@ > #include <netinet/if_ether.h> > #include <netinet/ip.h> > > -#if NBPFILTER > 0 > -#include <net/bpf.h> > -#endif Better remove the unguarded #include, I think. Even if a kernel configured without BPFILTER will not build... Index: ixgbe.h =================================================================== RCS file: /cvs/src/sys/dev/pci/ixgbe.h,v retrieving revision 1.22 diff -u -p -p -u -r1.22 ixgbe.h --- ixgbe.h 15 Mar 2016 16:45:52 -0000 1.22 +++ ixgbe.h 23 Sep 2016 17:51:44 -0000 @@ -55,7 +55,6 @@ #include <sys/atomic.h> #include <net/if.h> -#include <net/bpf.h> #include <net/if_media.h> #include <netinet/in.h> > - > typedef int boolean_t; > #define TRUE 1 > #define FALSE 0 > Index: usr.sbin/snmpd/snmpd.h > =================================================================== > RCS file: /cvs/src/usr.sbin/snmpd/snmpd.h,v > retrieving revision 1.67 > diff -u -p -r1.67 snmpd.h > --- usr.sbin/snmpd/snmpd.h 16 Aug 2016 18:41:57 -0000 1.67 > +++ usr.sbin/snmpd/snmpd.h 22 Sep 2016 14:08:51 -0000 > @@ -24,7 +24,6 @@ > #include <net/if_dl.h> > #include <netinet/in.h> > #include <netinet/if_ether.h> > -#include <netinet/in.h> > #include <netinet/ip.h> > #include <arpa/inet.h> > #include <net/pfvar.h> > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
