Merge third_party/smhasher/src from https://chromium.googlesource.com/external/smhasher.git at e87738e57558e0ec472b2fc3a643b838e5b6e88f

This commit was generated by merge_from_chromium.py.

Change-Id: Ie20768ee3b487da76fa6721313bae2b77e28ef4b

1 files changed, 9 insertions, 2 deletions

diff --git a/City.h b/City.h
index c12c1bb..99de55c 100644
--- a/City.h
+++ b/City.h
@@ -43,11 +43,18 @@
 #ifndef CITY_HASH_H_
 #define CITY_HASH_H_
 
-#include "Platform.h"
 #include <stdlib.h>  // for size_t.
-//#include <stdint.h>
 #include <utility>
 
+// Microsoft Visual Studio may not have stdint.h.
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+typedef unsigned char uint8_t;
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+#else  // defined(_MSC_VER)
+#include <stdint.h>
+#endif // !defined(_MSC_VER)
+
 typedef uint8_t uint8;
 typedef uint32_t uint32;
 typedef uint64_t uint64;