summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-07-13 14:31:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-07-13 14:31:36 -0700
commitbc50897b90177f03c74e53467d1b62aec74789c5 (patch)
tree0941931ed95253c41a2053859dfa3fa0a996ba97
parentMerge branch 'ln/gitweb-mime-types-split-at-blank' (diff)
parentUpdate the Interix default build configuration. (diff)
downloadtgif-bc50897b90177f03c74e53467d1b62aec74789c5.tar.xz
Merge branch 'md/interix-update'
* md/interix-update: Update the Interix default build configuration.
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f8c72e10a0..8d8f61e4f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1126,8 +1126,6 @@ endif
X = .exe
endif
ifeq ($(uname_S),Interix)
- NO_SYS_POLL_H = YesPlease
- NO_INTTYPES_H = YesPlease
NO_INITGROUPS = YesPlease
NO_IPV6 = YesPlease
NO_MEMMEM = YesPlease
@@ -1138,10 +1136,14 @@ ifeq ($(uname_S),Interix)
ifeq ($(uname_R),3.5)
NO_INET_NTOP = YesPlease
NO_INET_PTON = YesPlease
+ NO_SOCKADDR_STORAGE = YesPlease
+ NO_FNMATCH_CASEFOLD = YesPlease
endif
ifeq ($(uname_R),5.2)
NO_INET_NTOP = YesPlease
NO_INET_PTON = YesPlease
+ NO_SOCKADDR_STORAGE = YesPlease
+ NO_FNMATCH_CASEFOLD = YesPlease
endif
endif
ifneq (,$(findstring MINGW,$(uname_S)))