[04/13] Installed-header hygiene (BZ#20366): missing inclusions B.

Message ID 20160830011645.25769-5-zackw@panix.com
State Superseded
Headers

Commit Message

Zack Weinberg Aug. 30, 2016, 1:16 a.m. UTC
  A few more headers that did not include all their prerequisites.

	* rpcsvc/nislib.h: Include rpcsvc/nis.h.
	* sysdeps/unix/sysv/linux/netrose/rose.h:
	Include sys/socket.h and netax25/ax25.h.
---
 nis/rpcsvc/nislib.h                    | 2 +-
 sysdeps/unix/sysv/linux/netrose/rose.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
  

Comments

Carlos O'Donell Sept. 21, 2016, 5:52 p.m. UTC | #1
On 08/29/2016 09:16 PM, Zack Weinberg wrote:
> A few more headers that did not include all their prerequisites.
> 
> 	* rpcsvc/nislib.h: Include rpcsvc/nis.h.
> 	* sysdeps/unix/sysv/linux/netrose/rose.h:
> 	Include sys/socket.h and netax25/ax25.h.

OK conditional on proof the header removal didn't change any generated code.

> ---
>  nis/rpcsvc/nislib.h                    | 2 +-
>  sysdeps/unix/sysv/linux/netrose/rose.h | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/nis/rpcsvc/nislib.h b/nis/rpcsvc/nislib.h
> index 21a8e48..1a7c3c5 100644
> --- a/nis/rpcsvc/nislib.h
> +++ b/nis/rpcsvc/nislib.h
> @@ -19,7 +19,7 @@
>  #ifndef	__RPCSVC_NISLIB_H__
>  #define	__RPCSVC_NISLIB_H__
>  
> -#include <features.h>
> +#include <rpcsvc/nis.h>
>  
>  __BEGIN_DECLS
>  
> diff --git a/sysdeps/unix/sysv/linux/netrose/rose.h b/sysdeps/unix/sysv/linux/netrose/rose.h
> index 3cb7f84..762d3f5 100644
> --- a/sysdeps/unix/sysv/linux/netrose/rose.h
> +++ b/sysdeps/unix/sysv/linux/netrose/rose.h
> @@ -21,6 +21,9 @@
>  #ifndef _NETROSE_ROSE_H
>  #define _NETROSE_ROSE_H 1
>  
> +#include <sys/socket.h>
> +#include <netax25/ax25.h>
> +
>  /* Socket level values.  */
>  #define SOL_ROSE        260
>  
>
  

Patch

diff --git a/nis/rpcsvc/nislib.h b/nis/rpcsvc/nislib.h
index 21a8e48..1a7c3c5 100644
--- a/nis/rpcsvc/nislib.h
+++ b/nis/rpcsvc/nislib.h
@@ -19,7 +19,7 @@ 
 #ifndef	__RPCSVC_NISLIB_H__
 #define	__RPCSVC_NISLIB_H__
 
-#include <features.h>
+#include <rpcsvc/nis.h>
 
 __BEGIN_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/netrose/rose.h b/sysdeps/unix/sysv/linux/netrose/rose.h
index 3cb7f84..762d3f5 100644
--- a/sysdeps/unix/sysv/linux/netrose/rose.h
+++ b/sysdeps/unix/sysv/linux/netrose/rose.h
@@ -21,6 +21,9 @@ 
 #ifndef _NETROSE_ROSE_H
 #define _NETROSE_ROSE_H 1
 
+#include <sys/socket.h>
+#include <netax25/ax25.h>
+
 /* Socket level values.  */
 #define SOL_ROSE        260