[PATCH] include: Stop macro redefined on the mac build

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 include/winerror.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/include/winerror.h b/include/winerror.h
index 32680e0..d58aee8 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -66,6 +66,22 @@
 #define SEVERITY_SUCCESS    0
 #define SEVERITY_ERROR      1
 
+#undef MAKE_HRESULT
+#undef SUCCEEDED
+#undef FAILED
+#undef IS_ERROR
+#undef HRESULT_FACILITY
+#undef S_OK
+#undef S_FALSE
+#undef E_NOTIMPL
+#undef E_NOINTERFACE
+#undef E_POINTER
+#undef E_ABORT
+#undef E_FAIL
+#undef E_UNEXPECTED
+#undef E_HANDLE
+#undef E_OUTOFMEMORY
+#undef E_INVALIDARG
 
 #define MAKE_HRESULT(sev,fac,code) \
     ((HRESULT) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) )
-- 
1.9.1

[Alexandre Julliard]

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes:
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>  include/winerror.h | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)

It would be better to do this only in the places where the offending
macOS header is included.

-- 
Alexandre Julliard
julliard(a)winehq.org