From d70ed92ed0791193b53a5f6626abaa645837f91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Sun, 15 May 2016 23:16:42 +0200
Subject: [PATCH] Add a mingw-w64 patch

---
 Dockerfile       |  3 +++
 mingw-0004.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 mingw-0004.patch

diff --git a/Dockerfile b/Dockerfile
index 88b9966..3fe5b4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,6 +75,9 @@ RUN cd mingw-w64/mingw-w64-tools/genlib && \
     make -j4 && \
     make install
 
+COPY mingw-0004.patch /build/patches/
+RUN cd mingw-w64 && git am /build/patches/mingw-0004.patch
+
 RUN cd mingw-w64/mingw-w64-headers && mkdir build && cd build && \
     ../configure --host=$TARGET_TUPLE --prefix=$MINGW_PREFIX \
         --enable-secure-api && \
diff --git a/mingw-0004.patch b/mingw-0004.patch
new file mode 100644
index 0000000..4a8ded1
--- /dev/null
+++ b/mingw-0004.patch
@@ -0,0 +1,30 @@
+From 5592b70cca64935b0d090fe5030b3110ba17068c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
+Date: Fri, 13 May 2016 15:17:56 +0200
+Subject: [PATCH] yvals.h: Don't create a _Bool typedef if a macro already
+ exists
+
+---
+ mingw-w64-headers/crt/yvals.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mingw-w64-headers/crt/yvals.h b/mingw-w64-headers/crt/yvals.h
+index 70593c4..98b6921 100644
+--- a/mingw-w64-headers/crt/yvals.h
++++ b/mingw-w64-headers/crt/yvals.h
+@@ -163,10 +163,12 @@
+ #define _Restrict __restrict__
+ 
+ #ifdef __cplusplus
++#ifndef _Bool
+ _STD_BEGIN
+ typedef bool _Bool;
+ _STD_END
+ #endif
++#endif
+ 
+ #define _LONGLONG /* __MINGW_EXTENSION */ __int64
+ #define _ULONGLONG /* __MINGW_EXTENSION */ unsigned __int64
+-- 
+2.8.1
+