diff options
| author | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-02-03 19:09:00 -0800 |
|---|---|---|
| committer | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-02-04 22:34:38 +0000 |
| commit | bb747268ed89af8f034132fa46e30998b72a7ba9 (patch) | |
| tree | 3516c7edfb90c3aab4a832945d8a8b8e12dfffe8 /src/corelib/io/qprocess_unix.cpp | |
| parent | e9802a10730345f734adff31a6c023690878c883 (diff) | |
Clean up new poll code slightly
Change-Id: I046126ff69a77a50e79efb1b6ebb0fffef67ac8e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qprocess_unix.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 49bd772262..a6900544be 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -142,7 +142,7 @@ struct QProcessPoller QProcessPoller::QProcessPoller(const QProcessPrivate &proc) { for (int i = 0; i < n_pfds; i++) - pfds[i] = { -1, POLLIN, 0 }; + pfds[i] = qt_make_pollfd(-1, POLLIN); stdoutPipe().fd = proc.stdoutChannel.pipe[0]; stderrPipe().fd = proc.stderrChannel.pipe[0]; @@ -873,7 +873,7 @@ bool QProcessPrivate::waitForStarted(int msecs) childStartedPipe[0]); #endif - pollfd pfd = { childStartedPipe[0], POLLIN, 0 }; + pollfd pfd = qt_make_pollfd(childStartedPipe[0], POLLIN); if (qt_poll_msecs(&pfd, 1, msecs) == 0) { setError(QProcess::Timedout); @@ -1036,7 +1036,7 @@ bool QProcessPrivate::waitForFinished(int msecs) bool QProcessPrivate::waitForWrite(int msecs) { - pollfd pfd = { stdinChannel.pipe[1], POLLOUT, 0 }; + pollfd pfd = qt_make_pollfd(stdinChannel.pipe[1], POLLOUT); return qt_poll_msecs(&pfd, 1, msecs < 0 ? 0 : msecs) == 1; } |