summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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>