From: Martin Storsjö <martin@martin.st>
Date: Mon, 16 Aug 2021 08:50:10 +0000 (+0300)
Subject: [sanitizers] Fix building on 32 bit Windows after 7256c05ecb7
X-Git-Tag: upstream/15.0.7~33711
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18e06e3e2f3d47433e1ed323b8725c76035fc1ac;p=platform%2Fupstream%2Fllvm.git

[sanitizers] Fix building on 32 bit Windows after 7256c05ecb7

On 32 bit, 'long' (which is 32 bit on Windows) is used as base
type for SIZE_T and similar.

Differential Revision: https://reviews.llvm.org/D108191
---

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
index 45165f6..4adb387 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
@@ -139,7 +139,7 @@ namespace __sanitizer {
 typedef unsigned long long uptr;
 typedef signed long long sptr;
 #else
-#  if (SANITIZER_WORDSIZE == 64) || SANITIZER_MAC
+#  if (SANITIZER_WORDSIZE == 64) || SANITIZER_MAC || SANITIZER_WINDOWS
 typedef unsigned long uptr;
 typedef signed long sptr;
 #  else