[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 4/5] build: use gnulib's sys/wait.h



Eric Blake wrote:
> * configure.ac: Drop sys/wait.h check.
> * src/libvirt.c (includes): Use header unconditionally.
> * src/remote/remote_driver.c (includes): Likewise.
> * src/storage/storage_backend.c (includes): Likewise.
> * src/util/ebtables.c (includes): Likewise.
> * src/util/hooks.c (includes): Likewise.
> * src/util/iptables.c (includes): Likewise.
> * src/util/util.c (includes): Likewise.
> ---
>  bootstrap.conf                |    1 +
>  configure.ac                  |    2 +-
>  src/libvirt.c                 |    4 +---
>  src/remote/remote_driver.c    |    5 +----
>  src/storage/storage_backend.c |    4 +---
>  src/util/ebtables.c           |    7 ++-----
>  src/util/hooks.c              |    4 +---
>  src/util/iptables.c           |    7 ++-----
>  src/util/util.c               |    4 +---
>  9 files changed, 11 insertions(+), 27 deletions(-)
>
> diff --git a/bootstrap.conf b/bootstrap.conf
> index e85f869..baf0bc2 100644
> --- a/bootstrap.conf
> +++ b/bootstrap.conf
> @@ -57,6 +57,7 @@ strptime
>  strsep
>  strtok_r
>  sys_stat
> +sys_wait
>  time_r
>  timegm
>  uname
> diff --git a/configure.ac b/configure.ac
> index 9a983a7..26e10e0 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -123,7 +123,7 @@ LIBS=$old_libs
>
>  dnl Availability of various common headers (non-fatal if missing).
>  AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h \
> -  sys/wait.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h])
> +  sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h])

Reviewing this made me realize I hadn't performed this
clean-up in coreutils.  There were three.

FYI, coreutils' m4/stat-prog.m4 is the exception: I let it keep its
check for netinet/in.h and the "#if HAVE_NETINET_IN_H" guard, even though
gnulib provides it.  Otherwise, this macro would have to depend on the
netinet_in module.  That would be fine if stat-prog.m4 were a gnulib
module, but it's not...

> diff --git a/src/libvirt.c b/src/libvirt.c
> index ff36681..d6f7f21 100644
> --- a/src/libvirt.c
> +++ b/src/libvirt.c
> @@ -18,9 +18,7 @@
>  #include <sys/stat.h>
>  #include <unistd.h>
>  #include <assert.h>
> -#ifdef HAVE_SYS_WAIT_H
> -# include <sys/wait.h>
> -#endif
> +#include <sys/wait.h>

Mostly mechanical.
ACK.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]