提交 8acaeb73 编写于 作者: E Eric Blake

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.
上级 5349cf1e
...@@ -57,6 +57,7 @@ strptime ...@@ -57,6 +57,7 @@ strptime
strsep strsep
strtok_r strtok_r
sys_stat sys_stat
sys_wait
time_r time_r
timegm timegm
uname uname
......
...@@ -122,7 +122,7 @@ LIBS=$old_libs ...@@ -122,7 +122,7 @@ LIBS=$old_libs
dnl Availability of various common headers (non-fatal if missing). dnl Availability of various common headers (non-fatal if missing).
AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h \ 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 Where are the XDR functions?
dnl If portablexdr is installed, prefer that. dnl If portablexdr is installed, prefer that.
......
...@@ -18,9 +18,7 @@ ...@@ -18,9 +18,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h>
# include <sys/wait.h>
#endif
#include <time.h> #include <time.h>
#include <gcrypt.h> #include <gcrypt.h>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/wait.h>
/* Windows socket compatibility functions. */ /* Windows socket compatibility functions. */
#include <errno.h> #include <errno.h>
...@@ -45,10 +46,6 @@ ...@@ -45,10 +46,6 @@
# include <netinet/tcp.h> # include <netinet/tcp.h>
#endif #endif
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
#ifdef HAVE_PWD_H #ifdef HAVE_PWD_H
# include <pwd.h> # include <pwd.h>
#endif #endif
......
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
# include <regex.h> # include <regex.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#if HAVE_SYS_WAIT_H #include <sys/wait.h>
# include <sys/wait.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdint.h> #include <stdint.h>
......
/* /*
* Copyright (C) 2009 IBM Corp.
* Copyright (C) 2007-2010 Red Hat, Inc. * Copyright (C) 2007-2010 Red Hat, Inc.
* Copyright (C) 2009 IBM Corp.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
...@@ -33,10 +33,7 @@ ...@@ -33,10 +33,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h>
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
#ifdef HAVE_PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
......
...@@ -24,9 +24,7 @@ ...@@ -24,9 +24,7 @@
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#if HAVE_SYS_WAIT_H #include <sys/wait.h>
# include <sys/wait.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
......
/* /*
* 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
...@@ -31,10 +31,7 @@ ...@@ -31,10 +31,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h>
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
#ifdef HAVE_PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
......
...@@ -37,9 +37,7 @@ ...@@ -37,9 +37,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#if HAVE_SYS_WAIT_H #include <sys/wait.h>
# include <sys/wait.h>
#endif
#if HAVE_MMAP #if HAVE_MMAP
# include <sys/mman.h> # include <sys/mman.h>
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册