Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I2286830c4b7c1fb7a0492a189d61026f0811fbac
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;
