[vlc-devel] [PATCH] contrib:breakpad: fix compilation under mingw

[Steve Lhomme]

---
 contrib/src/breakpad/breakpad-mingw.patch | 28 ++++++++++++++++++++++++++++
 contrib/src/breakpad/rules.mak            |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 contrib/src/breakpad/breakpad-mingw.patch

diff --git a/contrib/src/breakpad/breakpad-mingw.patch b/contrib/src/breakpad/breakpad-mingw.patch
new file mode 100644
index 0000000000..f2ea096199
--- /dev/null
+++ b/contrib/src/breakpad/breakpad-mingw.patch
@@ -0,0 +1,28 @@
+--- breakpad/src/common/pecoff/pecoff.h	2018-02-12 16:22:01.741771200 +0100
++++ breakpad/src/common/pecoff/pecoff.h.mingw	2018-02-12 16:20:17.709633900 +0100
+@@ -39,6 +39,7 @@
+ 
+ #define IMAGE_FILE_MAGIC                     0x00004550 // "PE\0\0"
+ 
++#undef IMAGE_FILE_MACHINE_UNKNOWN /* mingw */
+ #define IMAGE_FILE_MACHINE_UNKNOWN           0x0000
+ #define IMAGE_FILE_MACHINE_ALPHA             0x0184
+ #define IMAGE_FILE_MACHINE_ALPHA64           0x0284
+@@ -47,7 +48,9 @@
+ #define IMAGE_FILE_MACHINE_ARM               0x01c0
+ #define IMAGE_FILE_MACHINE_ARMV7             0x01c4
+ #define IMAGE_FILE_MACHINE_CEE               0xc0ee
++#undef IMAGE_FILE_MACHINE_CEF /* mingw */
+ #define IMAGE_FILE_MACHINE_CEF               0x0cef
++#undef IMAGE_FILE_MACHINE_EBC /* mingw */
+ #define IMAGE_FILE_MACHINE_EBC               0x0ebc
+ #define IMAGE_FILE_MACHINE_I386              0x014c
+ #define IMAGE_FILE_MACHINE_IA64              0x0200
+@@ -56,6 +59,7 @@
+ #define IMAGE_FILE_MACHINE_MIPS16            0x0266
+ #define IMAGE_FILE_MACHINE_MIPSFPU           0x0366
+ #define IMAGE_FILE_MACHINE_MIPSFPU16         0x0466
++#undef IMAGE_FILE_MACHINE_POWERPC /* mingw */
+ #define IMAGE_FILE_MACHINE_POWERPC           0x01f0
+ #define IMAGE_FILE_MACHINE_POWERPCFP         0x01f1
+ #define IMAGE_FILE_MACHINE_R10000            0x0168
diff --git a/contrib/src/breakpad/rules.mak b/contrib/src/breakpad/rules.mak
index d2a27ed90f..821b63e760 100644
--- a/contrib/src/breakpad/rules.mak
+++ b/contrib/src/breakpad/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/breakpad-$(BREAKPAD_VERSION).tar.gz:
 
 breakpad: breakpad-$(BREAKPAD_VERSION).tar.gz .sum-breakpad
 	$(UNPACK)
+	$(APPLY) $(SRC)/breakpad/breakpad-mingw.patch
 	$(MOVE)
 
 .breakpad: breakpad
-- 
2.14.2