From 27e5d372e8ca10ad0c1fd189f9dc76eb14d7a3ca Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 23 Sep 2020 17:35:40 +0200 Subject: [PATCH] Undefine Status that somebody decided to put in the global namespace. --- src/lib/film.h | 1 - src/wx/gl_video_view.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) 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 #include #include -#include #include #include #include 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 #undef None #undef Success +#undef Status class GLVideoView : public VideoView { -- 2.30.2