Merge branch 'fix'

* fix: include header to define uint32_t, necessary on Mac OS X
19 years ago · 975bf9cf5a
2 changed files with 2 additions and 0 deletions
--- a/pack-objects.c
+++ b/pack-objects.c
@ -10,6 +10,7 @@
				@@ -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";

--- a/sha1_file.c
+++ b/sha1_file.c
@ -13,6 +13,7 @@
				@@ -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__))