Index: third_party/tcmalloc/chromium/src/base/vdso_support.cc |
diff --git a/third_party/tcmalloc/chromium/src/base/vdso_support.cc b/third_party/tcmalloc/chromium/src/base/vdso_support.cc |
index 09288a5319c4bb2bc0015f7cf8510d0956ddfdc5..444be26aa56f0f683ff641f1cc8f8c239b0d20a0 100644 |
--- a/third_party/tcmalloc/chromium/src/base/vdso_support.cc |
+++ b/third_party/tcmalloc/chromium/src/base/vdso_support.cc |
@@ -40,11 +40,11 @@ |
#ifdef HAVE_VDSO_SUPPORT // defined in vdso_support.h |
#include <fcntl.h> |
-#include <stddef.h> // for ptrdiff_t |
+#include <stddef.h> // for std::ptrdiff_t |
#include "base/atomicops.h" // for MemoryBarrier |
-#include "base/linux_syscall_support.h" |
#include "base/logging.h" |
+#include "base/linux_syscall_support.h" |
#include "base/dynamic_annotations.h" |
#include "base/basictypes.h" // for COMPILE_ASSERT |
@@ -266,7 +266,7 @@ void VDSOSupport::ElfMemImage::Init(const void *base) { |
Init(0); |
return; |
} |
- ptrdiff_t relocation = |
+ std::ptrdiff_t relocation = |
base_as_char - reinterpret_cast<const char *>(link_base_); |
ElfW(Dyn) *dynamic_entry = |
reinterpret_cast<ElfW(Dyn) *>(dynamic_program_header->p_vaddr + |