diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 12:27:37 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-04 12:28:48 +0100 |
| commit | f8246099eafbfa08910544a89c7a5047af92f54d (patch) | |
| tree | efd2a67ce5d866f4b46a2bbf804a5f9195d0d863 /src/3rdparty | |
| parent | 1bf639d5605863970b8dc5a91d5fc785cdf0ecf1 (diff) | |
| parent | 6ed957fd7fc748143093fa335d8b4506c3ea16fa (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/corelib/io/qstorageinfo_unix.cpp
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/widgets/styles/qwindowsvistastyle.cpp
Change-Id: Ie1725933815891cc8c86258d4c0e8ed0ab386edf
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/forkfd/forkfd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c index e55ef47683..3bf7fc3deb 100644 --- a/src/3rdparty/forkfd/forkfd.c +++ b/src/3rdparty/forkfd/forkfd.c @@ -61,6 +61,9 @@ #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500 # define HAVE_WAITID 1 #endif +#if !defined(WEXITED) || !defined(WNOWAIT) +# undef HAVE_WAITID +#endif #if defined(__FreeBSD__) # define HAVE_PIPE2 1 |