summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-30 01:52:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-30 01:52:34 (GMT)
commitec3f7d5d0f3676aa9634ee30f8c9e55893a8c505 (patch)
treeb51c8a2a902b671d0336a61276c0ae8f9b423836 /Makefile
parent1aa6583cc257f3b0570cbc25c89a54f0e4417ef6 (diff)
parent25fe66f84cea9c2e0a7f6b53180542784b94485a (diff)
downloadgit-ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505.zip
git-ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505.tar.gz
git-ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505.tar.bz2
Merge branch 'md/interix'
* md/interix: Interix: add configure checks add support for the SUA layer (interix; windows) Conflicts: git-compat-util.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile28
1 files changed, 28 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 919ed2b..1d42413 100644
--- a/Makefile
+++ b/Makefile
@@ -1099,6 +1099,25 @@ else
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
+ NO_MKDTEMP = YesPlease
+ NO_STRTOUMAX = YesPlease
+ NO_NSEC = YesPlease
+ NO_MKSTEMPS = YesPlease
+ ifeq ($(uname_R),3.5)
+ NO_INET_NTOP = YesPlease
+ NO_INET_PTON = YesPlease
+ endif
+ ifeq ($(uname_R),5.2)
+ NO_INET_NTOP = YesPlease
+ NO_INET_PTON = YesPlease
+ endif
+endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
NO_PREAD = YesPlease
@@ -1363,6 +1382,15 @@ endif
ifdef NO_SYS_SELECT_H
BASIC_CFLAGS += -DNO_SYS_SELECT_H
endif
+ifdef NO_SYS_POLL_H
+ BASIC_CFLAGS += -DNO_SYS_POLL_H
+endif
+ifdef NO_INTTYPES_H
+ BASIC_CFLAGS += -DNO_INTTYPES_H
+endif
+ifdef NO_INITGROUPS
+ BASIC_CFLAGS += -DNO_INITGROUPS
+endif
ifdef NO_MMAP
COMPAT_CFLAGS += -DNO_MMAP
COMPAT_OBJS += compat/mmap.o