diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-07-25 22:49:23 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-07-27 23:33:46 +0200 |
| commit | 67f39ff3eebb5ac727324b12130ff9cc262e9ffa (patch) | |
| tree | caad078b8211552c0b31e9b301827df96c6e7fba /src | |
| parent | b5cecdd0ee7c75388d95e2f987538fe88c23893a (diff) | |
Bump libdcp to one with some cleanups / header re-arrangement.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/atmos_content.h | 1 | ||||
| -rw-r--r-- | src/lib/cross.h | 2 | ||||
| -rw-r--r-- | src/wx/video_view.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/atmos_content.h b/src/lib/atmos_content.h index cfacb9729..afa3c75a2 100644 --- a/src/lib/atmos_content.h +++ b/src/lib/atmos_content.h @@ -21,6 +21,7 @@ #include "content_part.h" #include "types.h" +#include <dcp/types.h> class Content; 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> diff --git a/src/wx/video_view.h b/src/wx/video_view.h index b815afb7c..387cca9f6 100644 --- a/src/wx/video_view.h +++ b/src/wx/video_view.h @@ -29,6 +29,7 @@ #include "lib/timer.h" #include "lib/types.h" #include <dcp/warnings.h> +#include <dcp/types.h> LIBDCP_DISABLE_WARNINGS #include <wx/wx.h> LIBDCP_ENABLE_WARNINGS |