Title: [227226] trunk/Source/ThirdParty/libwebrtc
Revision
227226
Author
joep...@webkit.org
Date
2018-01-19 12:04:11 -0800 (Fri, 19 Jan 2018)

Log Message

Follow-up build fix for r227206.

Unreviewed.

* Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h:
Avoid duplicate and different definitions of ALWAYS_INLINE.

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (227225 => 227226)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2018-01-19 19:54:03 UTC (rev 227225)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2018-01-19 20:04:11 UTC (rev 227226)
@@ -1,3 +1,12 @@
+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-19  Youenn Fablet  <you...@apple.com>
 
         Softlink VideoProcessing in WebKit

Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h (227225 => 227226)


--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h	2018-01-19 19:54:03 UTC (rev 227225)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h	2018-01-19 20:04:11 UTC (rev 227226)
@@ -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

Reply via email to