Title: [227320] branches/safari-605-branch/Source/ThirdParty/libwebrtc
- Revision
- 227320
- Author
- jmarc...@apple.com
- Date
- 2018-01-22 09:58:12 -0800 (Mon, 22 Jan 2018)
Log Message
Cherry-pick r227226. rdar://problem/36722612
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/ChangeLog (227319 => 227320)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/ChangeLog 2018-01-22 17:58:09 UTC (rev 227319)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/ChangeLog 2018-01-22 17:58:12 UTC (rev 227320)
@@ -1,5 +1,18 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227226. rdar://problem/36722612
+
+ 2018-01-19 Joseph Pecoraro <pecor...@apple.com>
+
+ Follow-up build fix for r227206.
+
+ Unreviewed.
+
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h:
+ Avoid duplicate and different definitions of ALWAYS_INLINE.
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227206. rdar://problem/36722612
2018-01-19 Youenn Fablet <you...@apple.com>
Modified: branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h (227319 => 227320)
--- branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h 2018-01-22 17:58:09 UTC (rev 227319)
+++ branches/safari-605-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h 2018-01-22 17:58:12 UTC (rev 227320)
@@ -41,8 +41,6 @@
#include <VideoProcessing/VideoProcessing.h>
-#define ALWAYS_INLINE inline
-
#ifdef __cplusplus
#define WTF_EXTERN_C_BEGIN extern "C" {
#define WTF_EXTERN_C_END }
@@ -72,7 +70,7 @@
return softLink##framework##functionName parameterNames; \
} \
} \
- ALWAYS_INLINE resultType functionName parameterDeclarations \
+ inline resultType functionName parameterDeclarations \
{\
return functionNamespace::softLink##framework##functionName parameterNames; \
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
