diff options
author | Jonathan Liu <net147@gmail.com> | 2012-11-21 21:24:04 +1100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 14:08:12 +0100 |
commit | 96361d82c986e65740dd0c6b42cb725c15a17eea (patch) | |
tree | 8a8026a883bd9091efa1ecdca7479a34b83720d8 | |
parent | d429d65628da8c60907ead7e0c8250abc7ac6695 (diff) |
Fix MinGW compilation for tst_qwinoverlappedionotifier
Change-Id: I664761e7e6fd1c00067ae1def496ba4974e539be
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r-- | tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp b/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp index 4aee2926d3..c8a7d36196 100644 --- a/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp +++ b/tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp @@ -43,6 +43,10 @@ #include <private/qwinoverlappedionotifier_p.h> #include <qbytearray.h> +#ifndef PIPE_REJECT_REMOTE_CLIENTS +#define PIPE_REJECT_REMOTE_CLIENTS 0x08 +#endif + class tst_QWinOverlappedIoNotifier : public QObject { Q_OBJECT @@ -141,7 +145,8 @@ void tst_QWinOverlappedIoNotifier::readFile() notifier.setHandle(hFile); notifier.setEnabled(true); - OVERLAPPED overlapped = {0}; + OVERLAPPED overlapped; + ZeroMemory(&overlapped, sizeof(OVERLAPPED)); QByteArray buffer(readBufferSize, 0); BOOL readSuccess = ReadFile(hFile, buffer.data(), buffer.size(), NULL, &overlapped); QVERIFY(readSuccess || GetLastError() == ERROR_IO_PENDING); @@ -175,7 +180,8 @@ void tst_QWinOverlappedIoNotifier::waitForNotified() notifier.setEnabled(true); QCOMPARE(notifier.waitForNotified(100, 0), false); - OVERLAPPED overlapped = {0}; + OVERLAPPED overlapped; + ZeroMemory(&overlapped, sizeof(OVERLAPPED)); QByteArray buffer(readBufferSize, 0); BOOL readSuccess = ReadFile(hFile, buffer.data(), buffer.size(), NULL, &overlapped); QVERIFY(readSuccess || GetLastError() == ERROR_IO_PENDING); @@ -206,7 +212,8 @@ void tst_QWinOverlappedIoNotifier::brokenPipe() notifier.setHandle(hReadEnd); notifier.setEnabled(true); - OVERLAPPED overlapped = {0}; + OVERLAPPED overlapped; + ZeroMemory(&overlapped, sizeof(OVERLAPPED)); QByteArray buffer(1024, 0); BOOL readSuccess = ReadFile(hReadEnd, buffer.data(), buffer.size(), NULL, &overlapped); QVERIFY(readSuccess || GetLastError() == ERROR_IO_PENDING); |