summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-08-17 23:46:01 +0100
committerCarl Hetherington <cth@carlh.net>2013-08-17 23:46:01 +0100
commit2f0c03c8c410d8ddaace554d069575efcb3aa99f (patch)
tree4f7f08fbb4227f604782e09fedcc91a0fb0c8bf0 /src/lib
parentb5c373aeeafc5b0f095847e044fe066afb149e21 (diff)
Try to fix OS X compile failure.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/colour_conversion.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index 85d951ce1..f6b5bc9f3 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -20,6 +20,11 @@
#ifndef DCPOMATIC_COLOUR_CONVERSION_H
#define DCPOMATIC_COLOUR_CONVERSION_H
+/* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
+#ifdef check
+#undef check
+#endif
+
#include <boost/utility.hpp>
#include <boost/optional.hpp>
#include <boost/numeric/ublas/matrix.hpp>