Title: [284206] branches/safari-613.1.5-branch/Source/ThirdParty/libwebrtc
Revision
284206
Author
[email protected]
Date
2021-10-14 15:42:42 -0700 (Thu, 14 Oct 2021)

Log Message

Cherry-pick r284192. rdar://problem/84277677

    Unreviewed, fix up r284190 build fix.

    * Source/third_party/libwebm/webm_parser/src/master_parser.h:

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

Modified Paths

Diff

Modified: branches/safari-613.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog (284205 => 284206)


--- branches/safari-613.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog	2021-10-14 22:42:40 UTC (rev 284205)
+++ branches/safari-613.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog	2021-10-14 22:42:42 UTC (rev 284206)
@@ -1,5 +1,21 @@
 2021-10-14  Alan Coon  <[email protected]>
 
+        Cherry-pick r284192. rdar://problem/84277677
+
+    Unreviewed, fix up r284190 build fix.
+    
+    * Source/third_party/libwebm/webm_parser/src/master_parser.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284192 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-14  Chris Dumez  <[email protected]>
+
+            Unreviewed, fix up r284190 build fix.
+
+            * Source/third_party/libwebm/webm_parser/src/master_parser.h:
+
+2021-10-14  Alan Coon  <[email protected]>
+
         Cherry-pick r284190. rdar://problem/84277677
 
     Unreviewed build fix with latest SDKs.

Modified: branches/safari-613.1.5-branch/Source/ThirdParty/libwebrtc/Source/third_party/libwebm/webm_parser/src/master_parser.h (284205 => 284206)


--- branches/safari-613.1.5-branch/Source/ThirdParty/libwebrtc/Source/third_party/libwebm/webm_parser/src/master_parser.h	2021-10-14 22:42:40 UTC (rev 284205)
+++ branches/safari-613.1.5-branch/Source/ThirdParty/libwebrtc/Source/third_party/libwebm/webm_parser/src/master_parser.h	2021-10-14 22:42:42 UTC (rev 284206)
@@ -149,7 +149,7 @@
 
   using StdHashId = std::hash<std::underlying_type<Id>::type>;
 
-#if defined(WEBRTC_WEBKIT_BUILD) && defined(__clang__)
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -166,7 +166,7 @@
     }
   };
 
-#if defined(WEBRTC_WEBKIT_BUILD) && defined(__clang__)
+#if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to