From 9bd24b6edc7c15dffe382e226c782b394b40c632 Mon Sep 17 00:00:00 2001 From: kb Date: Sun, 13 May 2012 23:01:00 +0200 Subject: Do not override CO_E_NOT_SUPPORTED Change-Id: Id0cb9e1dca67400a2e3a02da663d810b06bdb6ec Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qtwindows_additional.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/windows/qtwindows_additional.h b/src/plugins/platforms/windows/qtwindows_additional.h index 3465d4ab1e..3c7211cb71 100644 --- a/src/plugins/platforms/windows/qtwindows_additional.h +++ b/src/plugins/platforms/windows/qtwindows_additional.h @@ -65,7 +65,9 @@ # define COLOR_MENUBAR 30 # define CF_DIBV5 17 +#if !defined(CO_E_NOT_SUPPORTED) #define CO_E_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80004021L) +#endif #define IFMETHOD HRESULT STDMETHODCALLTYPE #define IFACEMETHODIMP STDMETHODIMP -- cgit v1.2.3