From b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 1 Feb 2012 10:19:07 +0100 Subject: Windows: Fix inclusion of - Always use as the last file to be included. - Remove it from some headers, use Qt::HANDLE instead of HANDLE. - Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE. - Add NOMINMAX to qt_windows.h to avoid problems with the min/max macros. - Remove from qplatformdefs.h (VS2005) Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- src/corelib/kernel/qsystemsemaphore_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel/qsystemsemaphore_p.h') diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h index 10665228ea..527cb312cb 100644 --- a/src/corelib/kernel/qsystemsemaphore_p.h +++ b/src/corelib/kernel/qsystemsemaphore_p.h @@ -76,7 +76,7 @@ public: } #ifdef Q_OS_WIN - HANDLE handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open); + Qt::HANDLE handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open); void setErrorString(const QString &function); #else key_t handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open); @@ -89,8 +89,8 @@ public: QString fileName; int initialValue; #ifdef Q_OS_WIN - HANDLE semaphore; - HANDLE semaphoreLock; + Qt::HANDLE semaphore; + Qt::HANDLE semaphoreLock; #else int semaphore; bool createdFile; -- cgit v1.2.3