diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-16 00:48:22 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-16 00:48:22 +0400 |
| commit | d55aaefa3e3920bdf9a52d80da2a244f72742228 (patch) | |
| tree | c265d4d469c854e633886dad092ede685e248a93 /sha1_file.c | |
| parent | de1d4fa2a1273e09c32653c7a21602e36223348c (diff) | |
| parent | 1b9bc5a7b7434d771726011613a00cb202bd9f44 (diff) | |
Merge branch 'fix'
* fix:
Fix pack-index issue on 64-bit platforms a bit more portably.
Install git-send-email by default
Fix compilation on newer NetBSD systems
git config syntax updates
Another config file parsing fix.
checkout: use --aggressive when running a 3-way merge (-m).
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 3372ebcdca..223001033c 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__)) @@ -1162,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(*((uint32_t *)(index + 24 * mi))); + e->offset = ntohl(*((unsigned int *)(index + 24 * mi))); memcpy(e->sha1, sha1, 20); e->p = p; return 1; |