diff options
| author | Ralf Nolden <nolden@kde.org> | 2016-06-02 13:46:52 +0200 |
|---|---|---|
| committer | Ralf Nolden <nolden@kde.org> | 2016-06-04 18:11:12 +0000 |
| commit | 4fc797147821b4ef3372d4db9253d3cb1ed0704e (patch) | |
| tree | 2544e326ffac7840d6772f751a2213a5ad52df70 | |
| parent | 9c01fdb2badd0cbc5369cc31b6626718e5b4c23c (diff) | |
NetBSD/OpenBSD: Compile fix and proper detection of pipe2
Add the necessary defines for HAVE_PIPE2 for NetBSD and OpenBSD depending
on OS version when pipe2(2) was added. This also fixes the compile error
on NetBSD if -Werror=unused-function for ignore_sigpipe() as the
HAVE_PIPE2 tree is prior to O_NOSIGPIPE in create_pipe().
Change-Id: Ic8f875e34ef826a7bf046c77588afecaa097deca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/3rdparty/forkfd/forkfd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c index 9284a67674..7d2115abb6 100644 --- a/src/3rdparty/forkfd/forkfd.c +++ b/src/3rdparty/forkfd/forkfd.c @@ -30,6 +30,9 @@ #include "forkfd.h" #include <sys/types.h> +#if defined(__OpenBSD__) || defined(__NetBSD__) +# include <sys/param.h> +#endif #include <sys/time.h> #include <sys/resource.h> #include <sys/wait.h> @@ -65,7 +68,9 @@ # undef HAVE_WAITID #endif -#if defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032 +#if (defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032) || \ + (defined(__OpenBSD__) && OpenBSD >= 201505) || \ + (defined(__NetBSD__) && __NetBSD_Version__ >= 600000000) # define HAVE_PIPE2 1 #endif #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \ |