diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2013-04-22 08:55:51 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2013-04-22 08:55:51 +0000 |
commit | 5af0b8c852b3c1dce9cab30c58a80b423eb2ef8b (patch) | |
tree | a138108247f885f3c7a2aee5a16d6924ac377b63 | |
parent | 37edc2709a1b38fe23da686ebad6266a6df23d40 (diff) | |
parent | 8adb1336422e3ad4d78ba54fb56692f2ed07124c (diff) | |
download | src-5af0b8c852b3c1dce9cab30c58a80b423eb2ef8b.tar.gz |
Merge third_party/smhasher/src from https://chromium.googlesource.com/external/smhasher.git at 8adb1336422e3ad4d78ba54fb56692f2ed07124c
This commit was generated by merge_from_chromium.py.
Change-Id: I48bddcadccb4817edd8a80498e7f4d7ead9efeae
-rw-r--r-- | City.cpp | 2 | ||||
-rw-r--r-- | City.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -351,7 +351,7 @@ uint128 CityHash128(const char *s, size_t len) { } } -#ifdef __SSE4_2__ +#if defined(__SSE4_2__) && defined(__x86_64__) #include <nmmintrin.h> // Requires len >= 240. @@ -90,7 +90,7 @@ inline uint64 Hash128to64(const uint128& x) { // Conditionally include declarations for versions of City that require SSE4.2 // instructions to be available. -#ifdef __SSE4_2__ +#if defined(__SSE4_2__) && defined(__x86_64__) // Hash function for a byte array. uint128 CityHashCrc128(const char *s, size_t len); |