Title: [211004] trunk/Source/ThirdParty/libwebrtc
Revision
211004
Author
[email protected]
Date
2017-01-20 17:21:11 -0800 (Fri, 20 Jan 2017)

Log Message

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

Patch by Youenn Fablet <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (211003 => 211004)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2017-01-21 01:08:46 UTC (rev 211003)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2017-01-21 01:21:11 UTC (rev 211004)
@@ -1,3 +1,24 @@
+2017-01-20  Youenn Fablet  <[email protected]>
+
+        [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  <[email protected]>
+
+        [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  <[email protected]>
 
         [WebRTC] libwebrtc headers are incompatible with WebKit compilation flags

Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h (211003 => 211004)


--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h	2017-01-21 01:08:46 UTC (rev 211003)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/typedefs.h	2017-01-21 01:21:11 UTC (rev 211004)
@@ -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_
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to