diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 12:50:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-29 12:50:54 +0000 |
| commit | 592da13664b9c946ab793bd576cf83ed3c2b80e6 (patch) | |
| tree | e14e1f5512b1d18b3db96caeff6e5c2401d74ed5 /src/network/socket/qnet_unix_p.h | |
| parent | b9b3bff424677a84cdd73fd34f7514c2f700e612 (diff) | |
| parent | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/network/socket/qnet_unix_p.h')
| -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)); |