summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-19 12:20:40 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-19 12:20:40 -0700
commit9b79956018fafb97da82839148d3ea2acd3e5959 (patch)
tree25d7b1a50bc3510a6a6c98ffb44f34e12932a97d /config.mak.uname
parent31ccd35df4b7599c83fe46669ca36ca2c4fb3caa (diff)
parente0492c5be123ca264a5477e3481a8a765fe9ae99 (diff)
downloadgit-9b79956018fafb97da82839148d3ea2acd3e5959.tar.gz
Merge branch 'rj/msvc-build'
* rj/msvc-build: msvc: avoid collisions between "tags" and "TAGS" msvc: test-svn-fe: Fix linker "unresolved external" error msvc: Fix build by adding missing symbol defines msvc: git-daemon: Fix linker "unresolved external" errors msvc: Fix compilation errors caused by poll.h emulation
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname4
1 files changed, 3 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index e09af8fc13..9080054f76 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -326,7 +326,6 @@ ifeq ($(uname_S),Windows)
# NEEDS_LIBICONV = YesPlease
NO_ICONV = YesPlease
NO_STRTOUMAX = YesPlease
- NO_STRTOULL = YesPlease
NO_MKDTEMP = YesPlease
NO_MKSTEMPS = YesPlease
SNPRINTF_RETURNS_BOGUS = YesPlease
@@ -343,6 +342,9 @@ ifeq ($(uname_S),Windows)
NO_CURL = YesPlease
NO_PYTHON = YesPlease
BLK_SHA1 = YesPlease
+ ETAGS_TARGET = ETAGS
+ NO_INET_PTON = YesPlease
+ NO_INET_NTOP = YesPlease
NO_POSIX_GOODIES = UnfortunatelyYes
NATIVE_CRLF = YesPlease
DEFAULT_HELP_FORMAT = html