diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-15 23:52:00 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-16 00:01:37 +0400 |
| commit | 1b9bc5a7b7434d771726011613a00cb202bd9f44 (patch) | |
| tree | 52b810b4963ce4c079df9c70dafd9523276f7618 /sha1_file.c | |
| parent | f3dd5eae58cf3d0d944604af4c71a7043d5368fd (diff) | |
Fix pack-index issue on 64-bit platforms a bit more portably.v1.3.3
Apparently <stdint.h> is not enough for uint32_t on OpenBSD; use
"unsigned int" -- hopefully that would stay 32-bit on every
platform we care about, at least until we update the pack-index
file format.
Our sha1 routines optimized for architectures use uint32_t and
expects '#include <stdint.h>' to be enough, so OpenBSD on arm or
ppc might have similar issues down the road, I dunno.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index 673c58d450..66db206d9b 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -13,7 +13,6 @@ #include "commit.h" #include "tag.h" #include "tree.h" -#include <stdint.h> #ifndef O_NOATIME #if defined(__linux__) && (defined(__i386__) || defined(__PPC__)) @@ -1127,7 +1126,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(*((uint32_t *)(index + 24 * mi))); + e->offset = ntohl(*((unsigned int *)(index + 24 * mi))); memcpy(e->sha1, sha1, 20); e->p = p; return 1; |