diff options
| author | Martin Storsjö <martin@martin.st> | 2019-04-26 14:57:01 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2019-05-08 21:21:41 +0000 |
| commit | 827b7afba7b16cb25e276dc5e7bd74cd69c3acf9 (patch) | |
| tree | 84fc1fed209d59258f9234fc459772ab3a17f37e /src/3rdparty | |
| parent | 9444416a46ee0e6bb0d9d9be9a4883b388644c59 (diff) | |
ANGLE: Backport fix for compilation on mingw/64bit with clang
This backports the following upstream fix from angle:
https://github.com/google/angle/commit/63cc351fbad06c6241d1c7372fe76f74e1d09a10
Change-Id: Id80dba62c69f3505eb836f758367b4bf054b1fd5
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp b/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp index 071bc31539..93b48713cd 100644 --- a/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp +++ b/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp @@ -49,6 +49,7 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown. #include "PMurHash.h" +#include <stdint.h> /* I used ugly type names in the header to avoid potential conflicts with * application or system typedefs & defines. Since I'm not including any more @@ -208,7 +209,7 @@ void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int le /* This CPU does not handle unaligned word access */ /* Consume enough so that the next data byte is word aligned */ - int i = -(long)ptr & 3; + int i = -(intptr_t)ptr & 3; if(i && i <= len) { DOBYTES(i, h1, c, n, ptr, len); } |