Title: [227814] branches/safari-605-branch/Source/WTF
Revision
227814
Author
[email protected]
Date
2018-01-30 10:50:41 -0800 (Tue, 30 Jan 2018)

Log Message

Cherry-pick r227648. rdar://problem/37019367

Modified Paths

Diff

Modified: branches/safari-605-branch/Source/WTF/ChangeLog (227813 => 227814)


--- branches/safari-605-branch/Source/WTF/ChangeLog	2018-01-30 18:50:39 UTC (rev 227813)
+++ branches/safari-605-branch/Source/WTF/ChangeLog	2018-01-30 18:50:41 UTC (rev 227814)
@@ -1,5 +1,16 @@
 2018-01-30  Jason Marcell  <[email protected]>
 
+        Cherry-pick r227648. rdar://problem/37019367
+
+    2018-01-25  Filip Pizlo  <[email protected]>
+
+            Unreviewed, fix windows build.
+
+            * wtf/MathExtras.h:
+            (WTF::opaque):
+
+2018-01-30  Jason Marcell  <[email protected]>
+
         Cherry-pick r227643. rdar://problem/37019367
 
     2018-01-24  Filip Pizlo  <[email protected]>

Modified: branches/safari-605-branch/Source/WTF/wtf/MathExtras.h (227813 => 227814)


--- branches/safari-605-branch/Source/WTF/wtf/MathExtras.h	2018-01-30 18:50:39 UTC (rev 227813)
+++ branches/safari-605-branch/Source/WTF/wtf/MathExtras.h	2018-01-30 18:50:41 UTC (rev 227814)
@@ -494,7 +494,9 @@
 template<typename T>
 T opaque(T pointer)
 {
+#if !OS(WINDOWS)
     asm("" : "+r"(pointer));
+#endif
     return pointer;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to