diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
| commit | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch) | |
| tree | d84389d3c2a37b38435e0be5259f48e5f04290e0 /src/network/socket | |
| parent | a8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff) | |
| parent | 0d720a000f4f35c5ea6942426efec6847b06f4ce (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If6ba05867e7c98159e1b94ff71923e8b36bdbccb
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qnet_unix_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/socket/qnet_unix_p.h b/src/network/socket/qnet_unix_p.h index 9d17c6dd33..8d2a4ae852 100644 --- a/src/network/socket/qnet_unix_p.h +++ b/src/network/socket/qnet_unix_p.h @@ -115,7 +115,11 @@ static inline int qt_safe_accept(int s, struct sockaddr *addr, QT_SOCKLEN_T *add int sockflags = SOCK_CLOEXEC; if (flags & O_NONBLOCK) sockflags |= SOCK_NONBLOCK; +# if defined(Q_OS_NETBSD) + fd = ::paccept(s, addr, static_cast<QT_SOCKLEN_T *>(addrlen), NULL, sockflags); +# else fd = ::accept4(s, addr, static_cast<QT_SOCKLEN_T *>(addrlen), sockflags); +# endif return fd; #else fd = ::accept(s, addr, static_cast<QT_SOCKLEN_T *>(addrlen)); |