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 /pack-objects.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 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pack-objects.c b/pack-objects.c index b430b02cf7..566a2a2349 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -10,7 +10,6 @@ #include "tree-walk.h" #include <sys/time.h> #include <signal.h> -#include <stdint.h> static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list"; @@ -157,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++) { - uint32_t hl = *((uint32_t *)(index + 24 * i)); + unsigned int hl = *((unsigned int *)(index + 24 * i)); rix->revindex[i] = ntohl(hl); } /* This knows the pack format -- the 20-byte trailer |