wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 07e249e431c5009fa6ab8d274b4a8fe62a286358

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-05-17 08:58:11 +10:00
parent 1b7ebd3bb8
commit 071fe01910
6 changed files with 155 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
patches/include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch Normal file
View File

@@ -0,0 +1,39 @@
From 16defa342cfa6b1ebf0d3b46b3e4225ad4218d23 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 17 May 2019 09:10:46 +1000
Subject: [PATCH] include: Stop macro redefined on the mac build
---
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