diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:36 -0700 |
commit | bc50897b90177f03c74e53467d1b62aec74789c5 (patch) | |
tree | 0941931ed95253c41a2053859dfa3fa0a996ba97 /Makefile | |
parent | d4c8c55fab116a22284696143f434574c32ee7e4 (diff) | |
parent | 715876e58d2aeddf7e3b26e2fb5da0fc6e35e86f (diff) | |
download | git-bc50897b90177f03c74e53467d1b62aec74789c5.tar.gz |
Merge branch 'md/interix-update'
* md/interix-update:
Update the Interix default build configuration.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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))) |