projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5f89bf
)
Try to fix MinGW build.
author
Carl Hetherington
<cth@carlh.net>
Thu, 21 Jan 2021 23:02:12 +0000
(
00:02
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 21 Jan 2021 23:02:12 +0000
(
00:02
+0100)
src/types.h
patch
|
blob
|
history
diff --git
a/src/types.h
b/src/types.h
index c04b254362670aff9c9532b5a9b354abc8c0c820..4f2048b43c04876f32ff1b4dd45d793fe8d5d931 100644
(file)
--- 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,