[compiler-rt] 18e06e3 - [sanitizers] Fix building on 32 bit Windows after 7256c05ecb7

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2021-08-17T21:36:09+03:00
New Revision: 18e06e3e2f3d47433e1ed323b8725c76035fc1ac

URL: https://github.com/llvm/llvm-project/commit/18e06e3e2f3d47433e1ed323b8725c76035fc1ac
DIFF: https://github.com/llvm/llvm-project/commit/18e06e3e2f3d47433e1ed323b8725c76035fc1ac.diff

LOG: [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

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
index 45165f626951..4adb38737e96 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