Attachment 348130 Details for Bug 188981 – Patch

[patch] Patch

bug-188981-20180827130916.patch (text/plain), 9.60 KB, created by Alejandro G. Castro on 2018-08-27 04:09:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro G. Castro

Created: 2018-08-27 04:09:17 PDT

Size: 9.60 KB

patch

obsolete

>Subversion Revision: 235282
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 74ab35e9a5afa229efd616ee957eaef2226daa31..317f6e0b7fa7b3a71a236d5c736102438daf54d9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-08-27  Alejandro G. Castro  <alex@igalia.com>
>+
>+        Fix gcc compilation warnings after r235230
>+        https://bugs.webkit.org/show_bug.cgi?id=188981
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace the pragma clang with pragma GCC, it is understood by
>+        clang and gcc.
>+
>+        * Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h:
>+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
>+        * platform/mediastream/RealtimeIncomingAudioSource.h:
>+        * platform/mediastream/RealtimeIncomingVideoSource.h:
>+        * platform/mediastream/RealtimeOutgoingAudioSource.h:
>+        * platform/mediastream/RealtimeOutgoingVideoSource.h:
>+        * platform/mediastream/libwebrtc/LibWebRTCAudioModule.h:
>+        * platform/mediastream/libwebrtc/LibWebRTCProvider.cpp:
>+        * platform/mediastream/libwebrtc/LibWebRTCProvider.h:
>+        * testing/MockLibWebRTCPeerConnection.h:
>+
> 2018-08-24  Antti Koivisto  <antti@apple.com>
> 
>         Use OptionSet::containsAny and containsAll in some more places
>diff --git a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h
>index 50bf77624a46836a5270706a9f8ed6e5221bcfdd..55ce825c45da783d504d7d448042ec6fdb9a888f 100644
>--- a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h
>+++ b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h
>@@ -29,12 +29,12 @@
> #include "LibWebRTCMacros.h"
> #include "RTCDataChannelHandler.h"
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/datachannelinterface.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h
>index d409a1b23dd7fed899cad16ca6b292a4c60f498e..2f125d15f8bb3a27703392e637b49d99ae6640d1 100644
>--- a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h
>+++ b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h
>@@ -33,15 +33,15 @@
> #include "RealtimeOutgoingVideoSource.h"
> #include <Timer.h>
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/jsep.h>
> #include <webrtc/api/peerconnectioninterface.h>
> #include <webrtc/pc/peerconnectionfactory.h>
> #include <webrtc/pc/rtcstatscollector.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> #include <wtf/LoggerHelper.h>
> #include <wtf/ThreadSafeRefCounted.h>
>diff --git a/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.h b/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.h
>index cbf5730ac94d0a0d9302dfeb450badfedc4667ff..b51318c834e254aa9f72365efe67f354668ce9ae 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.h
>+++ b/Source/WebCore/platform/mediastream/RealtimeIncomingAudioSource.h
>@@ -35,12 +35,12 @@
> #include "LibWebRTCMacros.h"
> #include "RealtimeMediaSource.h"
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/mediastreaminterface.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> #include <wtf/RetainPtr.h>
> 
>diff --git a/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.h b/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.h
>index 4d7cad29a1ac613633ac82fe4515fbe622d33968..7247bb833857e48e99ee786e75e4a93bb005d5ed 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.h
>+++ b/Source/WebCore/platform/mediastream/RealtimeIncomingVideoSource.h
>@@ -35,12 +35,12 @@
> #include "LibWebRTCMacros.h"
> #include "RealtimeMediaSource.h"
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/mediastreaminterface.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> #include <wtf/RetainPtr.h>
> 
>diff --git a/Source/WebCore/platform/mediastream/RealtimeOutgoingAudioSource.h b/Source/WebCore/platform/mediastream/RealtimeOutgoingAudioSource.h
>index ce2e5b1d9e0c13c3c65826c26622a97cb10aa13c..ea457f7d53350afd1844ef3cf43211f8332956f4 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeOutgoingAudioSource.h
>+++ b/Source/WebCore/platform/mediastream/RealtimeOutgoingAudioSource.h
>@@ -35,12 +35,12 @@
> #include "MediaStreamTrackPrivate.h"
> #include "Timer.h"
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/mediastreaminterface.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> #include <wtf/ThreadSafeRefCounted.h>
> 
>diff --git a/Source/WebCore/platform/mediastream/RealtimeOutgoingVideoSource.h b/Source/WebCore/platform/mediastream/RealtimeOutgoingVideoSource.h
>index c1aa9d113951e6f802402b977b269372d6caee45..548ea3f01d807e87ce11d30e6cbcdb702f9155e1 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeOutgoingVideoSource.h
>+++ b/Source/WebCore/platform/mediastream/RealtimeOutgoingVideoSource.h
>@@ -34,13 +34,13 @@
> #include "MediaStreamTrackPrivate.h"
> #include <Timer.h>
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/mediastreaminterface.h>
> #include <webrtc/common_video/include/i420_buffer_pool.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> #include <wtf/Optional.h>
> #include <wtf/ThreadSafeRefCounted.h>
>diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCAudioModule.h b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCAudioModule.h
>index 71ca2ab5dba220408fffb28b8e80db5e9876cc32..79e99d7ce206f892596bdd4f3d1cef7e5eb37de0 100644
>--- a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCAudioModule.h
>+++ b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCAudioModule.h
>@@ -29,14 +29,14 @@
> 
> #include "LibWebRTCMacros.h"
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/modules/audio_device/include/audio_device.h>
> #include <webrtc/rtc_base/messagehandler.h>
> #include <webrtc/rtc_base/thread.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
>index b4bd0a451389827b1fbe65abbde93161fe72c24f..1a1453c89b7c3239fff5ea1d25b3d005e3951c38 100644
>--- a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
>+++ b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
>@@ -31,8 +31,8 @@
> #include "Logging.h"
> #include <dlfcn.h>
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/audio_codecs/builtin_audio_decoder_factory.h>
> #include <webrtc/api/audio_codecs/builtin_audio_encoder_factory.h>
>@@ -43,7 +43,7 @@
> #include <webrtc/pc/peerconnectionfactory.h>
> #include <webrtc/rtc_base/physicalsocketserver.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> #include <wtf/Function.h>
> #include <wtf/NeverDestroyed.h>
>diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h
>index d8c4069b29b42c32dbe9472cc47049c8ecaa7379..8fccf22a005fd79860c2c9586637036813238d96 100644
>--- a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h
>+++ b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h
>@@ -35,15 +35,15 @@
> 
> #if USE(LIBWEBRTC)
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/peerconnectioninterface.h>
> #include <webrtc/api/video_codecs/video_encoder_factory.h>
> #include <webrtc/api/video_codecs/video_decoder_factory.h>
> #include <webrtc/rtc_base/scoped_ref_ptr.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> namespace rtc {
> class NetworkManager;
>diff --git a/Source/WebCore/testing/MockLibWebRTCPeerConnection.h b/Source/WebCore/testing/MockLibWebRTCPeerConnection.h
>index 9a80da48fee76c5417b80d87c8447613083ba3a1..8403530e99d20b8d48ba9477ff179def6d8e8928 100644
>--- a/Source/WebCore/testing/MockLibWebRTCPeerConnection.h
>+++ b/Source/WebCore/testing/MockLibWebRTCPeerConnection.h
>@@ -28,13 +28,13 @@
> 
> #include "LibWebRTCMacros.h"
> 
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wunused-parameter"
>+#pragma GCC diagnostic push
>+#pragma GCC diagnostic ignored "-Wunused-parameter"
> 
> #include <webrtc/api/mediastreaminterface.h>
> #include <webrtc/api/peerconnectioninterface.h>
> 
>-#pragma clang diagnostic pop
>+#pragma GCC diagnostic pop
> 
> #include <wtf/text/WTFString.h>
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188981: 348130