commit 6ab5574461ff353131893c415e124b62d94e3def
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Jan 21 01:21:11 2017 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Jan 21 01:21:11 2017 +0000
tree 30637ed4c2a5f310b52ee7eeafe1b50f4bf61cf3
parent a60afb5a48dc422863a99a1efe29515be3537001

[WebRTC] Update libwertc AudioRtpSender::SetAudioSend
https://bugs.webkit.org/show_bug.cgi?id=167243

Patch by Youenn Fablet <youennf@gmail.com> on 2017-01-20
Reviewed by Alex Christensen.

Introducing  WEBRTC_WEBKIT_BUILD macro to match existing WEBRTC_CHROMIUM_BUILD.
WEBRTC_WEBKIT_BUILD is defined by current WebKit libwebrtc build system.

* Source/webrtc/api/rtpsender.cc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@211004 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/libwebrtc/ChangeLog

diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
index 7a40aa3..69605f4 100644
--- a/Source/ThirdParty/libwebrtc/ChangeLog
+++ b/Source/ThirdParty/libwebrtc/ChangeLog
@@ -1,3 +1,24 @@
+2017-01-20  Youenn Fablet  <youennf@gmail.com>
+
+        [WebRTC] Update libwertc AudioRtpSender::SetAudioSend
+        https://bugs.webkit.org/show_bug.cgi?id=167243
+
+        Reviewed by Alex Christensen.
+
+        Introducing  WEBRTC_WEBKIT_BUILD macro to match existing WEBRTC_CHROMIUM_BUILD.
+        WEBRTC_WEBKIT_BUILD is defined by current WebKit libwebrtc build system.
+
+        * Source/webrtc/api/rtpsender.cc:
+
+2017-01-20  Youenn Fablet  <youennf@gmail.com>
+
+        [WebRTC] libwebrtc NO_RETURN is conflicting with WebKit one
+        https://bugs.webkit.org/show_bug.cgi?id=167244
+
+        Reviewed by Alex Christensen.
+
+        * Source/webrtc/typedefs.h: Defining NO_RETURN only if not already defined.
+
 2017-01-20  Youenn Fablet  <youenn@apple.com>
 
         [WebRTC] libwebrtc headers are incompatible with WebKit compilation flags

Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h

diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h b/Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h
index 80af8ba..d5f4afa 100644
--- a/Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h
+++ b/Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h
@@ -99,6 +99,7 @@
 #endif
 #endif
 
+#ifndef NO_RETURN
 // Annotate a function that will not return control flow to the caller.
 #if defined(_MSC_VER)
 #define NO_RETURN __declspec(noreturn)
@@ -109,5 +110,6 @@
 #else
 #define NO_RETURN
 #endif
+#endif // NO_RETURN
 
 #endif  // WEBRTC_TYPEDEFS_H_