import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / container / src / dlmalloc_2_8_6.c

diff --git a/ceph/src/boost/libs/container/src/dlmalloc_2_8_6.c b/ceph/src/boost/libs/container/src/dlmalloc_2_8_6.c
index 7a53d3535b7ad4a8727bf5564fb64cf3697b195c..9aa1e5a5cbc0014b516d24e8455a8ec2e350942b 100644 (file)
--- a/ceph/src/boost/libs/container/src/dlmalloc_2_8_6.c
+++ b/ceph/src/boost/libs/container/src/dlmalloc_2_8_6.c
@@ -1515,7 +1515,7 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
 #pragma intrinsic (_InterlockedExchange)
 #define interlockedcompareexchange _InterlockedCompareExchange
 #define interlockedexchange _InterlockedExchange
-#elif defined(WIN32) && defined(__GNUC__)
+#elif defined(WIN32) && (defined(__GNUC__) || defined(__clang__))
 #define interlockedcompareexchange(a, b, c) __sync_val_compare_and_swap(a, c, b)
 #define interlockedexchange __sync_lock_test_and_set
 #endif /* Win32 */
@@ -2726,7 +2726,7 @@ static int has_segment_link(mstate m, msegmentptr ss) {
   noncontiguous segments are added.
 */
 #define TOP_FOOT_SIZE\
-  (align_offset(chunk2mem(0))+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE)
+  (align_offset(TWO_SIZE_T_SIZES)+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE)
 
 
 /* -------------------------------  Hooks -------------------------------- */