Merge branch 'fix'

* fix:
Fix git-pack-objects for 64-bit platforms

diff --git a/pack-objects.c b/pack-objects.c
index 523a1c7da8f1baf70d2f700dbafa8e78f9a1c4b3..1b9e7a1cb987627f762f5fb6f91b3df30ec93605 100644 (file)
--- 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 b62d0e3dcd0c0142a025d202eec2f233932aed68..631a605201e3a737e8e3db25f85f01a228b01282 100644 (file)
--- 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;