From b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 1 Feb 2012 10:19:07 +0100
Subject: 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>
---
 src/corelib/kernel/qsharedmemory_p.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/corelib/kernel/qsharedmemory_p.h')

diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index 4fd83fcae6..2eb90c2c1a 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -69,10 +69,8 @@ namespace QSharedMemoryPrivate
 #include "qsystemsemaphore.h"
 #include "private/qobject_p.h"
 
-#ifdef Q_OS_WIN
-#include <qt_windows.h>
-#else
-#include <sys/sem.h>
+#ifndef Q_OS_WIN
+#  include <sys/sem.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -131,7 +129,7 @@ public:
     static QString makePlatformSafeKey(const QString &key,
             const QString &prefix = QLatin1String("qipc_sharedmemory_"));
 #ifdef Q_OS_WIN
-    HANDLE handle();
+    Qt::HANDLE handle();
 #else
     key_t handle();
 #endif
@@ -156,7 +154,7 @@ public:
 
 private:
 #ifdef Q_OS_WIN
-    HANDLE hand;
+    Qt::HANDLE hand;
 #else
     key_t unix_key;
 #endif
-- 
cgit v1.2.3