Skip to site navigation (Press enter)

[webkit-changes] [158126] branches/safari-537.60-branch/Source/WTF

lforschler Mon, 28 Oct 2013 13:58:10 -0700

Title: [158126] branches/safari-537.60-branch/Source/WTF

Revision: 158126
Author: [email protected]
Date: 2013-10-28 13:59:33 -0700 (Mon, 28 Oct 2013)

Log Message

Merged r156933.


Modified Paths

branches/safari-537.60-branch/Source/WTF/ChangeLog
branches/safari-537.60-branch/Source/WTF/wtf/Platform.h

Diff

Modified: branches/safari-537.60-branch/Source/WTF/ChangeLog (158125 => 158126)


--- branches/safari-537.60-branch/Source/WTF/ChangeLog	2013-10-28 20:56:39 UTC (rev 158125)
+++ branches/safari-537.60-branch/Source/WTF/ChangeLog	2013-10-28 20:59:33 UTC (rev 158126)
@@ -1,3 +1,17 @@
+2013-10-28  Lucas Forschler  <[email protected]>
+
+        Merge r156933
+
+    2013-10-04  Brent Fulgham  <[email protected]>
+
+            [Win] Turn off FastMalloc on Windows
+            https://bugs.webkit.org/show_bug.cgi?id=122352
+
+            Reviewed by Darin Adler.
+
+            * wtf/Platform.h: Enable USE_SYSTEM_MALLOC when building on
+            Windows to stick to the MSVCRT allocator/deallocator.
+
 2013-08-05  Lucas Forschler  <[email protected]>
 
         Merge r153455

Modified: branches/safari-537.60-branch/Source/WTF/wtf/Platform.h (158125 => 158126)


--- branches/safari-537.60-branch/Source/WTF/wtf/Platform.h	2013-10-28 20:56:39 UTC (rev 158125)
+++ branches/safari-537.60-branch/Source/WTF/wtf/Platform.h	2013-10-28 20:59:33 UTC (rev 158126)
@@ -660,6 +660,7 @@
 
 #if OS(WINDOWS)
 #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
+#define USE_SYSTEM_MALLOC 1
 #endif
 
 #if !defined(ENABLE_GLOBAL_FASTMALLOC_NEW)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes