summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-07-10 21:53:53 -0700
committerThiago Macieira <thiago.macieira@intel.com>2015-07-17 17:36:14 +0000
commit61e621def380f28183b6ce7047e9a88a49f81f82 (patch)
tree26c45583d3108448be9ed76a59aefd3b7341b57d /src/corelib
parent7331b15525996179acb93f456ca24286418eca23 (diff)
Remove unnecessary check from qt_safe_pipe: condition can never happen
FD_CLOEXEC is implicit for us, so no caller will need to set O_CLOEXEC. Change-Id: Ib056b47dde3341ef9a52ffff13efcb635dea95f0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qcore_unix_p.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index fa083a3f44..ce8d9f6d65 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -179,11 +179,7 @@ static inline int qt_safe_open(const char *pathname, int flags, mode_t mode = 07
// call qt_safe_pipe
static inline int qt_safe_pipe(int pipefd[2], int flags = 0)
{
-#ifdef O_CLOEXEC
- Q_ASSERT((flags & ~(O_CLOEXEC | O_NONBLOCK)) == 0);
-#else
Q_ASSERT((flags & ~O_NONBLOCK) == 0);
-#endif
int ret;
#if QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC && defined(O_CLOEXEC)