Follow-up build fix for r227206.
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Jan 2018 20:04:11 +0000 (20:04 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Jan 2018 20:04:11 +0000 (20:04 +0000)
Unreviewed.

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

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

Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h

index 694b472..7d17b20 100644 (file)
@@ -1,3 +1,12 @@
+2018-01-19  Joseph Pecoraro  <pecoraro@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  <youenn@apple.com>
 
         Softlink VideoProcessing in WebKit
index 101f8a7..4c83b72 100644 (file)
@@ -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; \
     }