diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-23 17:35:40 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-23 22:34:09 +0200 |
| commit | 27e5d372e8ca10ad0c1fd189f9dc76eb14d7a3ca (patch) | |
| tree | 390894bb28be7fc2198aba1f7f3f5dcd490ffaf9 | |
| parent | 52e4de12b069f6bc3a290f902c7db37eedfa5098 (diff) | |
Undefine Status that somebody decided to put in the global namespace.
| -rw-r--r-- | src/lib/film.h | 1 | ||||
| -rw-r--r-- | src/wx/gl_video_view.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/film.h b/src/lib/film.h index 919a68c3d..66bcce806 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -35,7 +35,6 @@ #include <dcp/language_tag.h> #include <dcp/key.h> #include <dcp/encrypted_kdm.h> -#include <dcp/types.h> #include <boost/signals2.hpp> #include <boost/enable_shared_from_this.hpp> #include <boost/thread.hpp> diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index e1a7fc1ac..1f9ed08ea 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -33,6 +33,7 @@ DCPOMATIC_ENABLE_WARNINGS #include <boost/thread/condition.hpp> #undef None #undef Success +#undef Status class GLVideoView : public VideoView { |