diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:13 -0800 |
| commit | ace5348dcb427bbce015a42a21a46dc02ae1b37b (patch) | |
| tree | fed189ce949052d5c6b52c888f5437d3bccccc9f /sha1_file.c | |
| parent | a878e7e62b4826a95effa1420cff47807f9cb88b (diff) | |
| parent | fdcdb778551b904d57c127d9a3546f6a7c8792d3 (diff) | |
| download | git-ace5348dcb427bbce015a42a21a46dc02ae1b37b.tar.gz | |
Merge branch 'js/misc-fixes' into maint
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 ca699d7beb..40a0169ceb 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2137,7 +2137,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; } |