summaryrefslogtreecommitdiff
path: root/src/lib/cross.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-07-25 22:49:23 +0200
committerCarl Hetherington <cth@carlh.net>2023-07-27 23:33:46 +0200
commit67f39ff3eebb5ac727324b12130ff9cc262e9ffa (patch)
treecaad078b8211552c0b31e9b301827df96c6e7fba /src/lib/cross.h
parentb5cecdd0ee7c75388d95e2f987538fe88c23893a (diff)
Bump libdcp to one with some cleanups / header re-arrangement.
Diffstat (limited to 'src/lib/cross.h')
-rw-r--r--src/lib/cross.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 4be121d2b..4281700a7 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -29,6 +29,8 @@
#include <IOKit/pwr_mgt/IOPMLib.h>
#endif
#include <boost/filesystem.hpp>
+/* windows.h defines this but we want to use it */
+#undef ERROR
#include <boost/thread/mutex.hpp>
#include <boost/optional.hpp>