summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-13 22:24:18 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-13 22:24:18 -0700
commit3a3e89b897e122f1f154293e55b1d6c863ffbd2c (patch)
tree08240a87cd86d4f07ecef955257bca1abd8afd91 /sha1_file.c
parent639ca5497279607665847f2e3a11064441a8f2a6 (diff)
parent66561f5a776f2343331fff5b98adff1000622f42 (diff)
downloadgit-3a3e89b897e122f1f154293e55b1d6c863ffbd2c.tar.gz
Merge branch 'fix'
* fix: Fix git-pack-objects for 64-bit platforms
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index b62d0e3dcd..631a605201 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1161,7 +1161,7 @@ int find_pack_entry_one(const unsigned char *sha1,
int mi = (lo + hi) / 2;
int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
if (!cmp) {
- e->offset = ntohl(*((int*)(index + 24 * mi)));
+ e->offset = ntohl(*((uint32_t *)(index + 24 * mi)));
memcpy(e->sha1, sha1, 20);
e->p = p;
return 1;