diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/types.h | 9 |
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, |