projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b963be0
)
OS X build fix.
author
Carl Hetherington
<cth@carlh.net>
Thu, 11 Dec 2014 20:02:14 +0000
(20:02 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 11 Dec 2014 20:02:14 +0000
(20:02 +0000)
src/tools/dcpomatic.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic.cc
b/src/tools/dcpomatic.cc
index 27f029d9be44c9c3f6e6a0661849509797e85689..1a05ed2cbf8876203d682f0e26d462e35d87b664 100644
(file)
--- a/
src/tools/dcpomatic.cc
+++ b/
src/tools/dcpomatic.cc
@@
-63,6
+63,10
@@
#include <iostream>
#include <fstream>
+#ifdef check
+#undef check
+#endif
+
using std::cout;
using std::string;
using std::vector;