diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 20:06:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 20:07:00 (GMT) |
| commit | 808d11926351018f73db69d54e5920adef578f62 (patch) | |
| tree | 92c508142f25974235410353ce5c6f45c8d75207 /sha1_file.c | |
| parent | e88e424f4c9d9c8b622cc6a2ebe6e1fa058676f5 (diff) | |
| parent | fdcdb778551b904d57c127d9a3546f6a7c8792d3 (diff) | |
| download | git-808d11926351018f73db69d54e5920adef578f62.zip git-808d11926351018f73db69d54e5920adef578f62.tar.gz git-808d11926351018f73db69d54e5920adef578f62.tar.bz2 | |
Merge branch 'js/misc-fixes'
Various compilation fixes and squelching of warnings.
* js/misc-fixes:
Correct fscanf formatting string for I64u values
Silence GCC's "cast of pointer to integer of a different size" warning
Squelch warning about an integer overflow
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index 50896ff..c5b31de 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2126,7 +2126,7 @@ static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset) { unsigned long hash; - hash = (unsigned long)p + (unsigned long)base_offset; + hash = (unsigned long)(intptr_t)p + (unsigned long)base_offset; hash += (hash >> 8) + (hash >> 16); return hash % MAX_DELTA_CACHE; } |