Title: [158128] branches/safari-537.73-branch/Source/WTF
- Revision
- 158128
- Author
- [email protected]
- Date
- 2013-10-28 14:09:07 -0700 (Mon, 28 Oct 2013)
Log Message
Merged r156933. <rdar://problem/15323812>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WTF/ChangeLog (158127 => 158128)
--- branches/safari-537.73-branch/Source/WTF/ChangeLog 2013-10-28 21:05:35 UTC (rev 158127)
+++ branches/safari-537.73-branch/Source/WTF/ChangeLog 2013-10-28 21:09:07 UTC (rev 158128)
@@ -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-10-24 Lucas Forschler <[email protected]>
Merge r154655
Modified: branches/safari-537.73-branch/Source/WTF/wtf/Platform.h (158127 => 158128)
--- branches/safari-537.73-branch/Source/WTF/wtf/Platform.h 2013-10-28 21:05:35 UTC (rev 158127)
+++ branches/safari-537.73-branch/Source/WTF/wtf/Platform.h 2013-10-28 21:09:07 UTC (rev 158128)
@@ -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