From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 May 2006 23:20:09 +0000 (-0700)
Subject: Merge branch 'fix' into maint
X-Git-Tag: v1.3.3~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3f22deb7f58dff426a0853de62cc553ec97d6bf8?hp=d14f776402d9f7040cc71ff6e3b992b2e019526a

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 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__))