Title: [138408] trunk/Source/WTF
- Revision
- 138408
- Author
- loi...@chromium.org
- Date
- 2012-12-21 22:06:55 -0800 (Fri, 21 Dec 2012)
Log Message
Unreviewed compilation fix for Apple Win Release after r138398.
* wtf/FastMalloc.cpp:
(WTF::ClassIndex):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (138407 => 138408)
--- trunk/Source/WTF/ChangeLog 2012-12-22 05:40:25 UTC (rev 138407)
+++ trunk/Source/WTF/ChangeLog 2012-12-22 06:06:55 UTC (rev 138408)
@@ -1,3 +1,10 @@
+2012-12-21 Ilya Tikhonovsky <loi...@chromium.org>
+
+ Unreviewed compilation fix for Apple Win Release after r138398.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::ClassIndex):
+
2012-12-21 Oliver Hunt <oli...@apple.com>
Further harden FastMalloc
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (138407 => 138408)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2012-12-22 05:40:25 UTC (rev 138407)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2012-12-22 06:06:55 UTC (rev 138408)
@@ -517,7 +517,7 @@
#define ROTATE_VALUE(value, amount) (((value) >> (amount)) | ((value) << (sizeof(value) * 8 - (amount))))
#define XOR_MASK_PTR_WITH_KEY(ptr, key) (reinterpret_cast<typeof(ptr)>(reinterpret_cast<uintptr_t>(ptr)^ROTATE_VALUE(reinterpret_cast<uintptr_t>(key), MaskKeyShift)^ROTATE_VALUE(reinterpret_cast<uintptr_t>(&kLLHardeningMask), MaskAddrShift)))
#else
-#define XOR_MASK_PTR(ptr, key) (ptr1)
+#define XOR_MASK_PTR_WITH_KEY(ptr, key) (ptr1)
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
