Merge branch 'fix' into maint

* fix:
include header to define uint32_t, necessary on Mac OS X

diff --git a/pack-objects.c b/pack-objects.c
index a81d609b26d42fa5e35879a11d7716116850882d..aa2c09861721216b4631cbc6aeb165acac54efce 100644 (file)
--- 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 642c45ad75e166c37ddbfa77b0605f8597639508..673c58d4507bad82418a0de30b429fbad6385a5d 100644 (file)
--- 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__))