Merge branch 'fix'

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

diff --git a/pack-objects.c b/pack-objects.c
index 1b9e7a1cb987627f762f5fb6f91b3df30ec93605..5466b1516788c878bfd3377f74dab40f73355127 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 631a605201e3a737e8e3db25f85f01a228b01282..3372ebcdcac0d36b81663f958784e8a1ec84b900 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__))