Some more warning hiding.

diff --git a/src/lib/warnings.h b/src/lib/warnings.h
index d182526ff0a2d8a28f05d5fa06ad6f7453bb5153..278d284c932e5e6e5916a74657cd40c4418d6ac7 100644 (file)
--- a/src/lib/warnings.h
+++ b/src/lib/warnings.h
@@ -24,13 +24,15 @@
   _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
   _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \
   _Pragma("GCC diagnostic ignored \"-Wdeprecated-copy\"") \
-  _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")
+  _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \
+  _Pragma("GCC diagnostic ignored \"-Waddress\"")
 #else
 #define DCPOMATIC_DISABLE_WARNINGS \
   _Pragma("GCC diagnostic push") \
   _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
   _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \
-  _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")
+  _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \
+  _Pragma("GCC diagnostic ignored \"-Waddress\"")
 #endif
 
 #define DCPOMATIC_ENABLE_WARNINGS \

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 973eacf5d901f48db06e334dd985b846e3959686..8db975d548e4aed726b3933b11405a9163067f4f 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -36,9 +36,12 @@
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
 #include <dcp/locale_convert.h>
+#include "lib/warnings.h"
 #if defined(__WXGTK20__) && !defined(__WXGTK3__)
 #define TIMING_PANEL_ALIGNMENT_HACK 1
+DCPOMATIC_DISABLE_WARNINGS
 #include <gtk/gtk.h>
+DCPOMATIC_ENABLE_WARNINGS
 #endif
 #include <boost/foreach.hpp>
 #include <set>