Undefine Status that somebody decided to put in the global namespace.

diff --git a/src/lib/film.h b/src/lib/film.h
index 919a68c3d883002494527da3a57ab23706842231..66bcce80628830db9d977a1c4dcd3b42ecb7da7e 100644 (file)
--- 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 e1a7fc1acdba7b3237b50b163f355c3714b31ba3..1f9ed08ea75e78e2ef53bbbe48ca151389ea3977 100644 (file)
--- 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
 {