support: Simplify compiling most of support/ outside of glibc

Message ID 20171213161355.0996D439942EA@oldenburg.str.redhat.com
State Committed
Headers

Commit Message

Florian Weimer Dec. 13, 2017, 4:13 p.m. UTC
  Some include files were missing because they are implied by the
in-tree build process.

2017-12-13  Florian Weimer  <fweimer@redhat.com>

	Simplify compiling most of support/ outside of glibc.
	* support/check_addrinfo.c: Include <string.h>.
	* support/check_dns_packet.c: Likewise.
	* support/check_hostent.c: Likewise.
	* support/support_can_chroot.c: Include <support/xunistd.h>.
	* support/support_format_addrinfo.c: Include <stdlib.h>
	* support/support_format_dns_packet.c: Include <stdbool.h>.
	* support/support_format_hostent.c: Include <stdlib.h>.
	* support/support_format_netent.c: Likewise.
	* support/support_write_string.c: Include <support/xunistd.h>.
	* support/xdlfcn.c: Include <stddef.h>.
  

Comments

Adhemerval Zanella Dec. 13, 2017, 4:25 p.m. UTC | #1
On 13/12/2017 14:13, Florian Weimer wrote:
> Some include files were missing because they are implied by the
> in-tree build process.
> 
> 2017-12-13  Florian Weimer  <fweimer@redhat.com>
> 
> 	Simplify compiling most of support/ outside of glibc.
> 	* support/check_addrinfo.c: Include <string.h>.
> 	* support/check_dns_packet.c: Likewise.
> 	* support/check_hostent.c: Likewise.
> 	* support/support_can_chroot.c: Include <support/xunistd.h>.
> 	* support/support_format_addrinfo.c: Include <stdlib.h>
> 	* support/support_format_dns_packet.c: Include <stdbool.h>.
> 	* support/support_format_hostent.c: Include <stdlib.h>.
> 	* support/support_format_netent.c: Likewise.
> 	* support/support_write_string.c: Include <support/xunistd.h>.
> 	* support/xdlfcn.c: Include <stddef.h>.

Looks straightforward.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> 
> diff --git a/support/check_addrinfo.c b/support/check_addrinfo.c
> index 55895ace3c..c47f105ce6 100644
> --- a/support/check_addrinfo.c
> +++ b/support/check_addrinfo.c
> @@ -20,6 +20,7 @@
>  
>  #include <stdio.h>
>  #include <stdlib.h>
> +#include <string.h>
>  #include <support/check.h>
>  #include <support/format_nss.h>
>  #include <support/run_diff.h>
> diff --git a/support/check_dns_packet.c b/support/check_dns_packet.c
> index d2a31bed7b..6d14bd90c0 100644
> --- a/support/check_dns_packet.c
> +++ b/support/check_dns_packet.c
> @@ -20,6 +20,7 @@
>  
>  #include <stdio.h>
>  #include <stdlib.h>
> +#include <string.h>
>  #include <support/check.h>
>  #include <support/format_nss.h>
>  #include <support/run_diff.h>
> diff --git a/support/check_hostent.c b/support/check_hostent.c
> index 890d672d50..47fb8bc332 100644
> --- a/support/check_hostent.c
> +++ b/support/check_hostent.c
> @@ -20,6 +20,7 @@
>  
>  #include <stdio.h>
>  #include <stdlib.h>
> +#include <string.h>
>  #include <support/check.h>
>  #include <support/format_nss.h>
>  #include <support/run_diff.h>
> diff --git a/support/check_netent.c b/support/check_netent.c
> index daa3083fd1..80b69309b4 100644
> --- a/support/check_netent.c
> +++ b/support/check_netent.c
> @@ -20,6 +20,7 @@
>  
>  #include <stdio.h>
>  #include <stdlib.h>
> +#include <string.h>
>  #include <support/check.h>
>  #include <support/format_nss.h>
>  #include <support/run_diff.h>
> diff --git a/support/support_can_chroot.c b/support/support_can_chroot.c
> index 0dfd2deb54..a462753f76 100644
> --- a/support/support_can_chroot.c
> +++ b/support/support_can_chroot.c
> @@ -21,9 +21,9 @@
>  #include <support/check.h>
>  #include <support/namespace.h>
>  #include <support/support.h>
> +#include <support/xunistd.h>
>  #include <sys/stat.h>
>  #include <unistd.h>
> -#include <xunistd.h>
>  
>  static void
>  callback (void *closure)
> diff --git a/support/support_format_addrinfo.c b/support/support_format_addrinfo.c
> index eedb030591..daf335f775 100644
> --- a/support/support_format_addrinfo.c
> +++ b/support/support_format_addrinfo.c
> @@ -21,6 +21,7 @@
>  #include <arpa/inet.h>
>  #include <errno.h>
>  #include <stdio.h>
> +#include <stdlib.h>
>  #include <support/support.h>
>  #include <support/xmemstream.h>
>  
> diff --git a/support/support_format_dns_packet.c b/support/support_format_dns_packet.c
> index 2992c57971..e5ef1aa4b3 100644
> --- a/support/support_format_dns_packet.c
> +++ b/support/support_format_dns_packet.c
> @@ -20,6 +20,7 @@
>  
>  #include <arpa/inet.h>
>  #include <resolv.h>
> +#include <stdbool.h>
>  #include <support/check.h>
>  #include <support/support.h>
>  #include <support/xmemstream.h>
> diff --git a/support/support_format_hostent.c b/support/support_format_hostent.c
> index 88c85ec1f1..0aac17972b 100644
> --- a/support/support_format_hostent.c
> +++ b/support/support_format_hostent.c
> @@ -21,6 +21,7 @@
>  #include <arpa/inet.h>
>  #include <errno.h>
>  #include <stdio.h>
> +#include <stdlib.h>
>  #include <support/support.h>
>  #include <support/xmemstream.h>
>  
> diff --git a/support/support_format_netent.c b/support/support_format_netent.c
> index 020f5720d9..be8f1720a2 100644
> --- a/support/support_format_netent.c
> +++ b/support/support_format_netent.c
> @@ -20,6 +20,7 @@
>  
>  #include <arpa/inet.h>
>  #include <stdio.h>
> +#include <stdlib.h>
>  #include <support/support.h>
>  #include <support/xmemstream.h>
>  
> diff --git a/support/support_write_file_string.c b/support/support_write_file_string.c
> index 48e89597f3..48736530bf 100644
> --- a/support/support_write_file_string.c
> +++ b/support/support_write_file_string.c
> @@ -19,7 +19,7 @@
>  #include <fcntl.h>
>  #include <string.h>
>  #include <support/check.h>
> -#include <xunistd.h>
> +#include <support/xunistd.h>
>  
>  void
>  support_write_file_string (const char *path, const char *contents)
> diff --git a/support/xdlfcn.c b/support/xdlfcn.c
> index 6e3979983d..05966c41ef 100644
> --- a/support/xdlfcn.c
> +++ b/support/xdlfcn.c
> @@ -16,6 +16,7 @@
>     License along with the GNU C Library; if not, see
>     <http://www.gnu.org/licenses/>.  */
>  
> +#include <stddef.h>
>  #include <support/check.h>
>  #include <support/xdlfcn.h>
>  
>
  

Patch

diff --git a/support/check_addrinfo.c b/support/check_addrinfo.c
index 55895ace3c..c47f105ce6 100644
--- a/support/check_addrinfo.c
+++ b/support/check_addrinfo.c
@@ -20,6 +20,7 @@ 
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <support/check.h>
 #include <support/format_nss.h>
 #include <support/run_diff.h>
diff --git a/support/check_dns_packet.c b/support/check_dns_packet.c
index d2a31bed7b..6d14bd90c0 100644
--- a/support/check_dns_packet.c
+++ b/support/check_dns_packet.c
@@ -20,6 +20,7 @@ 
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <support/check.h>
 #include <support/format_nss.h>
 #include <support/run_diff.h>
diff --git a/support/check_hostent.c b/support/check_hostent.c
index 890d672d50..47fb8bc332 100644
--- a/support/check_hostent.c
+++ b/support/check_hostent.c
@@ -20,6 +20,7 @@ 
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <support/check.h>
 #include <support/format_nss.h>
 #include <support/run_diff.h>
diff --git a/support/check_netent.c b/support/check_netent.c
index daa3083fd1..80b69309b4 100644
--- a/support/check_netent.c
+++ b/support/check_netent.c
@@ -20,6 +20,7 @@ 
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <support/check.h>
 #include <support/format_nss.h>
 #include <support/run_diff.h>
diff --git a/support/support_can_chroot.c b/support/support_can_chroot.c
index 0dfd2deb54..a462753f76 100644
--- a/support/support_can_chroot.c
+++ b/support/support_can_chroot.c
@@ -21,9 +21,9 @@ 
 #include <support/check.h>
 #include <support/namespace.h>
 #include <support/support.h>
+#include <support/xunistd.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <xunistd.h>
 
 static void
 callback (void *closure)
diff --git a/support/support_format_addrinfo.c b/support/support_format_addrinfo.c
index eedb030591..daf335f775 100644
--- a/support/support_format_addrinfo.c
+++ b/support/support_format_addrinfo.c
@@ -21,6 +21,7 @@ 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <support/support.h>
 #include <support/xmemstream.h>
 
diff --git a/support/support_format_dns_packet.c b/support/support_format_dns_packet.c
index 2992c57971..e5ef1aa4b3 100644
--- a/support/support_format_dns_packet.c
+++ b/support/support_format_dns_packet.c
@@ -20,6 +20,7 @@ 
 
 #include <arpa/inet.h>
 #include <resolv.h>
+#include <stdbool.h>
 #include <support/check.h>
 #include <support/support.h>
 #include <support/xmemstream.h>
diff --git a/support/support_format_hostent.c b/support/support_format_hostent.c
index 88c85ec1f1..0aac17972b 100644
--- a/support/support_format_hostent.c
+++ b/support/support_format_hostent.c
@@ -21,6 +21,7 @@ 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <support/support.h>
 #include <support/xmemstream.h>
 
diff --git a/support/support_format_netent.c b/support/support_format_netent.c
index 020f5720d9..be8f1720a2 100644
--- a/support/support_format_netent.c
+++ b/support/support_format_netent.c
@@ -20,6 +20,7 @@ 
 
 #include <arpa/inet.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <support/support.h>
 #include <support/xmemstream.h>
 
diff --git a/support/support_write_file_string.c b/support/support_write_file_string.c
index 48e89597f3..48736530bf 100644
--- a/support/support_write_file_string.c
+++ b/support/support_write_file_string.c
@@ -19,7 +19,7 @@ 
 #include <fcntl.h>
 #include <string.h>
 #include <support/check.h>
-#include <xunistd.h>
+#include <support/xunistd.h>
 
 void
 support_write_file_string (const char *path, const char *contents)
diff --git a/support/xdlfcn.c b/support/xdlfcn.c
index 6e3979983d..05966c41ef 100644
--- a/support/xdlfcn.c
+++ b/support/xdlfcn.c
@@ -16,6 +16,7 @@ 
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <stddef.h>
 #include <support/check.h>
 #include <support/xdlfcn.h>