summaryrefslogtreecommitdiff
path: root/compat/vcbuild
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-16 20:55:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-16 20:55:36 (GMT)
commitb5c6aac01baf9164e08915b348490710e83119f9 (patch)
tree4099aab13b34925e45a6b57bb0af30288a22739e /compat/vcbuild
parent620b89cd98219db33ce499c7f8e50d091fe9b598 (diff)
parent93d85f57be00859f8adecd474da30a7279cd4ec2 (diff)
downloadgit-b5c6aac01baf9164e08915b348490710e83119f9.zip
git-b5c6aac01baf9164e08915b348490710e83119f9.tar.gz
git-b5c6aac01baf9164e08915b348490710e83119f9.tar.bz2
Merge branch 'rj/msvc-fix'
* rj/msvc-fix: msvc: Fix macro redefinition warnings msvc: Fix build by adding missing INTMAX_MAX define msvc: git-daemon.exe: Fix linker "unresolved externals" error msvc: Fix compilation errors in compat/win32/sys/poll.c
Diffstat (limited to 'compat/vcbuild')
-rw-r--r--compat/vcbuild/include/unistd.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h
index 2a4f276..b14fcf9 100644
--- a/compat/vcbuild/include/unistd.h
+++ b/compat/vcbuild/include/unistd.h
@@ -45,6 +45,10 @@ typedef unsigned long long uintmax_t;
typedef int64_t off64_t;
+#define INTMAX_MIN _I64_MIN
+#define INTMAX_MAX _I64_MAX
+#define UINTMAX_MAX _UI64_MAX
+
#define STDOUT_FILENO 1
#define STDERR_FILENO 2