  # define SI_LINUX_NOT_ANDROID 1
  #else
  # define SI_LINUX_NOT_ANDROID 0
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
 index b7fa6e8..431e8b2 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
 @@ -22,6 +22,11 @@
  #ifdef _FILE_OFFSET_BITS
  #undef _FILE_OFFSET_BITS

 
 #endif  // INTERCEPTION_LINUX_H
 #endif  // SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD ||
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc
index b055bb7..2015254 100644
--- a/lib/msan/msan_interceptors.cc
+++ b/lib/msan/msan_interceptors.cc
@@ -57,6 +57,9 @@ DECLARE_REAL(SIZE_T, strlen, const char *s)
 DECLARE_REAL(SIZE_T, strnlen, const char *s, SIZE_T maxlen)
 DECLARE_REAL(void *, memcpy, void *dest, const void *src, uptr n)

 
 // True if this is a nested interceptor.
 static THREADLOCAL int in_interceptor_scope;
diff --git a/lib/msan/msan_linux.cpp b/lib/msan/msan_linux.cpp
index 3b6e6cb..6186260 100644
--- a/lib/msan/msan_linux.cpp
+++ b/lib/msan/msan_linux.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
