From bb747268ed89af8f034132fa46e30998b72a7ba9 Mon Sep 17 00:00:00 2001 From: Louai Al-Khanji Date: Wed, 3 Feb 2016 19:09:00 -0800 Subject: Clean up new poll code slightly Change-Id: I046126ff69a77a50e79efb1b6ebb0fffef67ac8e Reviewed-by: Thiago Macieira --- src/corelib/io/qprocess_unix.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/io/qprocess_unix.cpp') 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; } -- cgit v1.2.3