summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-22 00:02:12 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-22 00:02:12 +0100
commit472b1e897fd6031bfeaac93d715391cc221067d1 (patch)
tree3c4018240abb87d67f8a9930a90d8e6adaef8d90 /src
parente5f89bffcfb92756fe292d5d27ef2dcfd42e2af6 (diff)
Try to fix MinGW build.
Diffstat (limited to 'src')
-rw-r--r--src/types.h9
1 files 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,