Bug 878363 - Followup, fix compilers complaining about fixing other compilers complaining about an unknown warning. r=ted
authorJohn Schoenick <jschoenick@mozilla.com>
Tue, 11 Jun 2013 15:58:37 -0700
changeset 135696 fdb7780fe53c3e428d7163e86192766363929650
parent 135695 6f3461e66694e80b7f1081eb4c18664fb0c9fbe7
child 135697 af744b5304d8987db9fece5df38d0c96aeecc94a
push id29781
push userjschoenick@mozilla.com
push dateWed, 19 Jun 2013 22:08:52 +0000
treeherdermozilla-inbound@fdb7780fe53c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs878363
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 878363 - Followup, fix compilers complaining about fixing other compilers complaining about an unknown warning. r=ted
content/media/gstreamer/GStreamerLoader.h
content/media/gstreamer/GStreamerReader.h
--- a/content/media/gstreamer/GStreamerLoader.h
+++ b/content/media/gstreamer/GStreamerLoader.h
@@ -7,17 +7,25 @@
 #define GStreamerLoader_h_
 
 #include <gst/gst.h>
 #include <gst/gstbuffer.h>
 #include <gst/gstelementfactory.h>
 #include <gst/gststructure.h>
 #include <gst/app/gstappsrc.h>
 #include <gst/app/gstappsink.h>
+// This include trips -Wreserved-user-defined-literal on clang. Ignoring it
+// trips -Wpragmas on GCC (unknown warning), but ignoring that trips
+// -Wunknown-pragmas on clang (unknown pragma).
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wreserved-user-defined-literal"
 #include <gst/video/video.h>
+#pragma GCC diagnostic pop
 
 namespace mozilla {
 
 /*
  * dlopens the required libraries and dlsyms the functions we need.
  * Returns true on success, false otherwise.
  */
 bool load_gstreamer();
--- a/content/media/gstreamer/GStreamerReader.h
+++ b/content/media/gstreamer/GStreamerReader.h
@@ -3,17 +3,21 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if !defined(GStreamerReader_h_)
 #define GStreamerReader_h_
 
 #include <gst/gst.h>
 #include <gst/app/gstappsrc.h>
 #include <gst/app/gstappsink.h>
+// This include trips -Wreserved-user-defined-literal on clang. Ignoring it
+// trips -Wpragmas on GCC (unknown warning), but ignoring that trips
+// -Wunknown-pragmas on clang (unknown pragma).
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wpragmas"
 #pragma GCC diagnostic ignored "-Wreserved-user-defined-literal"
 #include <gst/video/video.h>
 #pragma GCC diagnostic pop
 #include <map>
 #include "MediaDecoderReader.h"
 
 namespace mozilla {