diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-15 18:26:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 18:26:34 -0700 |
| commit | 35702a983e2d8e6bb7b0ebff4016648f407366a2 (patch) | |
| tree | 23bebcc63a28eac4de30d28465d27b8a433fb9b3 /sha1_file.c | |
| parent | Merge branch 'jc/apply' into next (diff) | |
| parent | Merge branch 'lt/oneway' (diff) | |
| download | tgif-35702a983e2d8e6bb7b0ebff4016648f407366a2.tar.xz | |
Merge branch 'master' into next
* master:
Fix silly typo in new builtin grep
Fix pack-index issue on 64-bit platforms a bit more portably.
Install git-send-email by default
Fix compilation on newer NetBSD systems
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; |