diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-12 09:13:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-12 09:13:17 +0000 |
| commit | 20abfe6b7ab3fb7bcadc1134c59612b7f70afceb (patch) | |
| tree | 61a2edf2884aad9709ae6a4060113032bd6e35aa /src | |
| parent | dda0b03a09271fbc3566bff9e0f4cc89fb5433c3 (diff) | |
| parent | 1ede0607183bed52a0adfa26a513e5857ecf5a70 (diff) | |
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 27f029d9b..1a05ed2cb 100644 --- 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; |