aboutsummaryrefslogtreecommitdiff
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
parent639ca5497279607665847f2e3a11064441a8f2a6 (diff)
parent66561f5a776f2343331fff5b98adff1000622f42 (diff)
downloadgit-3a3e89b897e122f1f154293e55b1d6c863ffbd2c.tar.gz
git-3a3e89b897e122f1f154293e55b1d6c863ffbd2c.tar.xz
Merge branch 'fix'
* fix: Fix git-pack-objects for 64-bit platforms
-rw-r--r--pack-objects.c2
-rw-r--r--sha1_file.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/pack-objects.c b/pack-objects.c
index 523a1c7da..1b9e7a1cb 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -156,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)
rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
for (i = 0; i < num_ent; i++) {
- long hl = *((long *)(index + 24 * i));
+ uint32_t hl = *((uint32_t *)(index + 24 * i));
rix->revindex[i] = ntohl(hl);
}
/* This knows the pack format -- the 20-byte trailer
diff --git a/sha1_file.c b/sha1_file.c
index b62d0e3dc..631a60520 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;