diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-01 10:19:07 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 11:06:19 +0100 |
commit | b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 (patch) | |
tree | fd10ab1e36f4b0c2c6b8d2061ae3dc71c508ba7b /src/corelib/kernel/qsystemsemaphore_p.h | |
parent | 9fa4e51dbb8cac4f7f5a6bee6e1b9b029b57f393 (diff) |
Windows: Fix inclusion of <windows.h>
- Always use <qt_windows.h> 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 <windows.h> from qplatformdefs.h (VS2005)
Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qsystemsemaphore_p.h')
-rw-r--r-- | src/corelib/kernel/qsystemsemaphore_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |