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

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



* 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])

 dnl Where are the XDR functions?
 dnl If portablexdr is installed, prefer that.
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>
 #include <time.h>
 #include <gcrypt.h>

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index b798cdf..ef7a229 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <arpa/inet.h>
+#include <sys/wait.h>

 /* Windows socket compatibility functions. */
 #include <errno.h>
@@ -45,10 +46,6 @@
 # include <netinet/tcp.h>
 #endif

-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 #ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index f0074ed..4d34f9a 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -29,9 +29,7 @@
 # include <regex.h>
 #endif
 #include <sys/types.h>
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdint.h>
diff --git a/src/util/ebtables.c b/src/util/ebtables.c
index a6afdf8..e2b9608 100644
--- a/src/util/ebtables.c
+++ b/src/util/ebtables.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2009 IBM Corp.
  * Copyright (C) 2007-2010 Red Hat, Inc.
+ * Copyright (C) 2009 IBM Corp.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,10 +33,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>

 #ifdef HAVE_PATHS_H
 # include <paths.h>
diff --git a/src/util/hooks.c b/src/util/hooks.c
index 507029f..dec9223 100644
--- a/src/util/hooks.c
+++ b/src/util/hooks.c
@@ -24,9 +24,7 @@
 #include <config.h>

 #include <sys/types.h>
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/util/iptables.c b/src/util/iptables.c
index facc4da..4f95a02 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Red Hat, Inc.
+ * Copyright (C) 2007-2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,10 +31,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>

 #ifdef HAVE_PATHS_H
 # include <paths.h>
diff --git a/src/util/util.c b/src/util/util.c
index c7d5c05..b2dd2ed 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -37,9 +37,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 #if HAVE_MMAP
 # include <sys/mman.h>
 #endif
-- 
1.6.6.1


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