From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 May 2006 23:20:15 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~149
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=975bf9cf5ad5d440f98f464ae8124609a4835ce1;hp=5f7f211a54cb62fba4f017cdf3b9bc0c3a7843e1;p=git.git

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 1b9e7a1c..5466b151 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 631a6052..3372ebcd 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__))