[asan] minor ifdef cleanup
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@149274 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_allocator.cc b/lib/asan/asan_allocator.cc
index 35d8352..3a8f9a7 100644
--- a/lib/asan/asan_allocator.cc
+++ b/lib/asan/asan_allocator.cc
@@ -35,6 +35,10 @@
#include "asan_thread.h"
#include "asan_thread_registry.h"
+#ifdef _WIN32
+#include <intrin.h>
+#endif
+
namespace __asan {
#define REDZONE FLAG_redzone
@@ -59,10 +63,6 @@
return (a & (alignment - 1)) == 0;
}
-#ifdef _WIN32
-#include <intrin.h>
-#endif
-
static inline size_t Log2(size_t x) {
CHECK(IsPowerOfTwo(x));
#if defined(_WIN64)
diff --git a/lib/asan/asan_internal.h b/lib/asan/asan_internal.h
index 5be5186..fc92e9c 100644
--- a/lib/asan/asan_internal.h
+++ b/lib/asan/asan_internal.h
@@ -20,9 +20,7 @@
#include <stdlib.h> // for size_t, uintptr_t, etc.
-#if !defined(_WIN32)
-#include <stdint.h> // for __WORDSIZE
-#else
+#if defined(_WIN32)
// There's no <stdint.h> in Visual Studio 9, so we have to define [u]int*_t.
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
@@ -32,16 +30,8 @@
typedef __int16 int16_t;
typedef __int32 int32_t;
typedef __int64 int64_t;
-
-// Visual Studio does not define ssize_t.
-#ifdef _WIN64
-typedef int64_t ssize_t;
-#define __WORDSIZE 64
#else
-typedef int32_t ssize_t;
-#define __WORDSIZE 32
-#endif
-
+# include <stdint.h> // for __WORDSIZE
#endif // _WIN32
// If __WORDSIZE was undefined by the platform, define it in terms of the