Re: Remove more duplicated includes

[Frederic Cambus]

On Fri, Sep 23, 2016 at 08:02:03PM +0200, Jeremie Courreges-Anglas wrote:
> >
> > A few remaining duplicated includes to remove.
> >
> > Comments? OK?
> 
> ok except for ixgbe.h
> 
> Better remove the unguarded #include, I think.  Even if a kernel
> configured without BPFILTER will not build...

That makes sense, here is an updated diff. OK?

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 -  1.10
+++ sys/arch/sparc64/include/asm.h  25 Sep 2016 13:46:14 -
@@ -41,11 +41,6 @@
 #ifndef _MACHINE_ASM_H_
 #define _MACHINE_ASM_H_
 
-#ifndef _LOCORE
-#define _LOCORE
-#endif
-#include 
-
 /* 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 -  1.22
+++ sys/dev/pci/ixgbe.h 25 Sep 2016 13:46:15 -
@@ -55,7 +55,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #include 
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 -  1.67
+++ usr.sbin/snmpd/snmpd.h  25 Sep 2016 13:46:17 -
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Re: Remove more duplicated includes

[Jeremie Courreges-Anglas]

Frederic Cambus  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.h27 May 2016 16:32:39 -  1.10
> +++ sys/arch/sparc64/include/asm.h22 Sep 2016 14:08:50 -
> @@ -41,11 +41,6 @@
>  #ifndef _MACHINE_ASM_H_
>  #define _MACHINE_ASM_H_
>  
> -#ifndef _LOCORE
> -#define _LOCORE
> -#endif
> -#include 
> -
>  /* 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 -  1.22
> +++ sys/dev/pci/ixgbe.h   22 Sep 2016 14:08:51 -
> @@ -62,10 +62,6 @@
>  #include 
>  #include 
>  
> -#if NBPFILTER > 0
> -#include 
> -#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 -  1.22
+++ ixgbe.h 23 Sep 2016 17:51:44 -
@@ -55,7 +55,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #include 


> -
>  typedef int  boolean_t;
>  #define TRUE 1
>  #define FALSE0
> 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.h16 Aug 2016 18:41:57 -  1.67
> +++ usr.sbin/snmpd/snmpd.h22 Sep 2016 14:08:51 -
> @@ -24,7 +24,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE