diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-20 01:13:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-22 03:33:22 (GMT) |
| commit | bdc37f5a817543fc5eaf16dd6f30dd7b821adc70 (patch) | |
| tree | 9513450e8b5f1d8d7121262ced28c05e9506d570 | |
| parent | eff351c957975055643f2e1359652ab3aac30256 (diff) | |
| download | git-bdc37f5a817543fc5eaf16dd6f30dd7b821adc70.zip git-bdc37f5a817543fc5eaf16dd6f30dd7b821adc70.tar.gz git-bdc37f5a817543fc5eaf16dd6f30dd7b821adc70.tar.bz2 | |
Makefile: do not assume lack of IPV6 means no sockaddr_storage.
Noticed first by Alex, that the latest Cygwin now properly has
sockaddr_storage.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -45,6 +45,9 @@ all: # # Define NO_IPV6 if you lack IPv6 support and getaddrinfo(). # +# Define NO_SOCKADDR_STORAGE if your platform does not have struct +# sockaddr_storage. +# # Define COLLISION_CHECK below if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you # sufficient guarantee that no collisions between objects will ever happen. @@ -344,7 +347,14 @@ ifdef NO_MMAP COMPAT_OBJS += compat/mmap.o endif ifdef NO_IPV6 - ALL_CFLAGS += -DNO_IPV6 -Dsockaddr_storage=sockaddr_in + ALL_CFLAGS += -DNO_IPV6 +endif +ifdef NO_SOCKADDR_STORAGE +ifdef NO_IPV6 + ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in +else + ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in6 +endif endif ifdef PPC_SHA1 |