From 472b1e897fd6031bfeaac93d715391cc221067d1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 22 Jan 2021 00:02:12 +0100
Subject: Try to fix MinGW build.

---
 src/types.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/types.h b/src/types.h
index c04b2543..4f2048b4 100644
--- a/src/types.h
+++ b/src/types.h
@@ -44,6 +44,11 @@
 #include <boost/function.hpp>
 #include <string>
 
+
+/* MinGW seems to define this, but we want to use it */
+#undef ERROR
+
+
 namespace xmlpp {
 	class Element;
 }
@@ -252,9 +257,7 @@ struct EqualityOptions
 	bool export_differing_subtitles;
 };
 
-/* I've been unable to make mingw happy with ERROR as a symbol, so
-   I'm using a DCP_ prefix here.
-*/
+
 enum class NoteType {
 	PROGRESS,
 	ERROR,
-- 
cgit v1.2.3