diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-01-05 12:35:54 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-01-05 12:35:54 +0200 |
| commit | 2c6120755c44dc68605e33f6f84aa9896af55d28 (patch) | |
| tree | 5db2234d144d0b2de95677854bdb74020493492f | |
| parent | 5085ae9923d5995e5f285dc54f45b38cf3d09698 (diff) | |
| download | rpm-2c6120755c44dc68605e33f6f84aa9896af55d28.tar.gz | |
Unconditionally include <sys/wait.h> where needed
- no point conditionalizing what we cant live without
| -rw-r--r-- | build/build.c | 2 | ||||
| -rw-r--r-- | build/rpmfc.c | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/backend/db3.c | 1 | ||||
| -rw-r--r-- | lib/signature.c | 1 | ||||
| -rw-r--r-- | rpmio/rpmfileutil.c | 1 | ||||
| -rw-r--r-- | rpmio/url.c | 1 | ||||
| -rw-r--r-- | rpmqv.c | 3 | ||||
| -rw-r--r-- | system.h | 4 |
9 files changed, 10 insertions, 6 deletions
diff --git a/build/build.c b/build/build.c index a4a271a43..ada633d76 100644 --- a/build/build.c +++ b/build/build.c @@ -5,6 +5,8 @@ #include "system.h" +#include <sys/wait.h> + #include <rpm/rpmbuild.h> #include <rpm/rpmlog.h> #include <rpm/rpmfileutil.h> diff --git a/build/rpmfc.c b/build/rpmfc.c index d948fc8ec..e92a6bdd7 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -1,6 +1,7 @@ #include "system.h" #include <sys/select.h> +#include <sys/wait.h> #include <signal.h> #include <magic.h> diff --git a/configure.ac b/configure.ac index bf53a75dd..75587eba8 100644 --- a/configure.ac +++ b/configure.ac @@ -358,7 +358,7 @@ AC_CHECK_HEADERS(limits.h) AC_CHECK_HEADERS(fcntl.h getopt.h memory.h) AC_CHECK_HEADERS(sys/ipc.h) -AC_CHECK_HEADERS(sys/utsname.h sys/wait.h) +AC_CHECK_HEADERS(sys/utsname.h) AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h) AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/param.h sys/vmount.h) diff --git a/lib/backend/db3.c b/lib/backend/db3.c index 9636be2c8..73a2d6c8f 100644 --- a/lib/backend/db3.c +++ b/lib/backend/db3.c @@ -6,6 +6,7 @@ static int _debug = 1; /* XXX if < 0 debugging, > 0 unusual error returns */ #include "system.h" +#include <sys/wait.h> #if defined(HAVE_FTOK) && defined(HAVE_SYS_IPC_H) #include <sys/ipc.h> #endif diff --git a/lib/signature.c b/lib/signature.c index 030eb8ceb..957009be2 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -5,6 +5,7 @@ #include "system.h" #include <inttypes.h> +#include <sys/wait.h> #include <popt.h> #include <rpm/rpmtypes.h> diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c index 92524436d..593447845 100644 --- a/rpmio/rpmfileutil.c +++ b/rpmio/rpmfileutil.c @@ -17,6 +17,7 @@ #include <sys/mman.h> #endif +#include <sys/wait.h> #include <popt.h> #include <rpm/rpmfileutil.h> diff --git a/rpmio/url.c b/rpmio/url.c index cd73e9a36..8ad1c3255 100644 --- a/rpmio/url.c +++ b/rpmio/url.c @@ -7,6 +7,7 @@ #include <assert.h> #include <netinet/in.h> #include <netdb.h> +#include <sys/wait.h> #include <rpm/rpmmacro.h> #include <rpm/rpmlog.h> @@ -11,12 +11,13 @@ const char *__progname; #define IAM_RPMK #endif +#include <sys/wait.h> + #include <rpm/rpmcli.h> #include <rpm/rpmlib.h> /* RPMSIGTAG, rpmReadPackageFile .. */ #include <rpm/rpmbuild.h> #include <rpm/rpmlog.h> #include <rpm/rpmfileutil.h> - #include <rpm/rpmdb.h> #include <rpm/rpmps.h> #include <rpm/rpmts.h> @@ -97,10 +97,6 @@ char *getenv (const char *name); #include <ctype.h> -#if HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif - #if HAVE_LIMITS_H #include <limits.h> #endif |