diff options
author | Bo Liu <boliu@google.com> | 2014-05-01 10:38:39 -0700 |
---|---|---|
committer | Bo Liu <boliu@google.com> | 2014-05-01 10:38:39 -0700 |
commit | 09e3094b8ab52bb1ad9ab8c8351d99df50327b67 (patch) | |
tree | 72b8b9186b057c053fb6721bb9ad51b3d5764cd5 | |
parent | b7e646582d337106321415bcd641f2a0eb9dead2 (diff) | |
parent | a4d3bea09429da7e768edcb2861b6db85b042750 (diff) | |
download | src-android-5.1.1_r36.tar.gz |
Merge from Chromium at DEPS revision 267519HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1ub-webview-m40-releasemaster-soongmastermainlollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-release
This commit was generated by merge_to_master.py.
Change-Id: I2286830c4b7c1fb7a0492a189d61026f0811fbac
-rw-r--r-- | City.h | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -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; |