diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-14 16:20:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 16:20:09 -0700 |
| commit | 3f22deb7f58dff426a0853de62cc553ec97d6bf8 (patch) | |
| tree | 281a426f68823461874bf3d418ef217210e229fa | |
| parent | d14f776402d9f7040cc71ff6e3b992b2e019526a (diff) | |
| parent | d9635e9c539465792b1920437b52fa8792a71650 (diff) | |
| download | git-3f22deb7f58dff426a0853de62cc553ec97d6bf8.tar.gz | |
Merge branch 'fix' into maint
* fix:
include header to define uint32_t, necessary on Mac OS X
| -rw-r--r-- | pack-objects.c | 1 | ||||
| -rw-r--r-- | sha1_file.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pack-objects.c b/pack-objects.c index a81d609b26..aa2c098617 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -10,6 +10,7 @@ #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"; diff --git a/sha1_file.c b/sha1_file.c index 642c45ad75..673c58d450 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -13,6 +13,7 @@ #include "commit.h" #include "tag.h" #include "tree.h" +#include <stdint.h> #ifndef O_NOATIME #if defined(__linux__) && (defined(__i386__) || defined(__PPC__)) |