diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-15 20:48:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 20:48:22 (GMT) |
| commit | d55aaefa3e3920bdf9a52d80da2a244f72742228 (patch) | |
| tree | c265d4d469c854e633886dad092ede685e248a93 /pack-objects.c | |
| parent | de1d4fa2a1273e09c32653c7a21602e36223348c (diff) | |
| parent | 1b9bc5a7b7434d771726011613a00cb202bd9f44 (diff) | |
| download | git-d55aaefa3e3920bdf9a52d80da2a244f72742228.zip git-d55aaefa3e3920bdf9a52d80da2a244f72742228.tar.gz git-d55aaefa3e3920bdf9a52d80da2a244f72742228.tar.bz2 | |
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 '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 5466b15..0dbda2c 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 |