diff options
| author | Evan Martin <martine@danga.com> | 2012-08-10 20:27:08 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-08-10 20:44:40 (GMT) |
| commit | d58a10965610eb6b338e411ce816b810d76ab59e (patch) | |
| tree | f5e9627cb0fcd0c2f62665388fa93f284ba318ee /src/build_log.cc | |
| parent | d98ba72ef8adfb1698b8de197de6751c8b14d5c0 (diff) | |
| download | Ninja-d58a10965610eb6b338e411ce816b810d76ab59e.zip Ninja-d58a10965610eb6b338e411ce816b810d76ab59e.tar.gz Ninja-d58a10965610eb6b338e411ce816b810d76ab59e.tar.bz2 | |
windows: fix size_t<->int conversions in ninja.exe
Diffstat (limited to 'src/build_log.cc')
| -rw-r--r-- | src/build_log.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/build_log.cc b/src/build_log.cc index 1b27be3..e72a93e 100644 --- a/src/build_log.cc +++ b/src/build_log.cc @@ -49,7 +49,7 @@ const int kCurrentVersion = 5; #define BIG_CONSTANT(x) (x##LLU) #endif // !defined(_MSC_VER) inline -uint64_t MurmurHash64A(const void* key, int len) { +uint64_t MurmurHash64A(const void* key, size_t len) { static const uint64_t seed = 0xDECAFBADDECAFBADull; const uint64_t m = BIG_CONSTANT(0xc6a4a7935bd1e995); const int r = 47; @@ -58,11 +58,11 @@ uint64_t MurmurHash64A(const void* key, int len) { const uint64_t * end = data + (len/8); while(data != end) { uint64_t k = *data++; - k *= m; - k ^= k >> r; - k *= m; + k *= m; + k ^= k >> r; + k *= m; h ^= k; - h *= m; + h *= m; } const unsigned char* data2 = (const unsigned char*)data; switch(len & 7) @@ -80,7 +80,7 @@ uint64_t MurmurHash64A(const void* key, int len) { h *= m; h ^= h >> r; return h; -} +} #undef BIG_CONSTANT |