From 5f0fb6f114bb907b7122c265ca120bca26dd60d5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 22 Apr 2014 17:12:50 +0200
Subject: [PATCH] Fix definition of HRESULT in qwindowdefs_win.h.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-38435
Change-Id: I4a08cd0656fa5d6ecb0b94aa71ca000268835b89
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
---
 src/gui/kernel/qwindowdefs_win.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h
index fea995a0f59..0dd027e585c 100644
--- a/src/gui/kernel/qwindowdefs_win.h
+++ b/src/gui/kernel/qwindowdefs_win.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -107,7 +107,7 @@ Q_DECLARE_HANDLE(HRGN);
 #ifndef HMONITOR
 Q_DECLARE_HANDLE(HMONITOR);
 #endif
-#ifndef HRESULT
+#ifndef _HRESULT_DEFINED
 typedef long HRESULT;
 #endif