summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/smhasher/src/MurmurHash1.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/smhasher/src/MurmurHash1.h')
-rw-r--r--chromium/third_party/smhasher/src/MurmurHash1.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/smhasher/src/MurmurHash1.h b/chromium/third_party/smhasher/src/MurmurHash1.h
index 93b08c3bc2b..24e1ad3a02f 100644
--- a/chromium/third_party/smhasher/src/MurmurHash1.h
+++ b/chromium/third_party/smhasher/src/MurmurHash1.h
@@ -10,10 +10,10 @@
// Microsoft Visual Studio
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
typedef unsigned char uint8_t;
-typedef unsigned long uint32_t;
+typedef unsigned int uint32_t;
typedef unsigned __int64 uint64_t;
// Other compilers