Try to fix MinGW build.
authorCarl Hetherington <cth@carlh.net>
Thu, 21 Jan 2021 23:02:12 +0000 (00:02 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 21 Jan 2021 23:02:12 +0000 (00:02 +0100)
src/types.h

index c04b254362670aff9c9532b5a9b354abc8c0c820..4f2048b43c04876f32ff1b4dd45d793fe8d5d931 100644 (file)
 #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,