Call it NO_IPV6 rather than hard-coding __CYGWIN__

diff --git a/Makefile b/Makefile
index 55b06f276b519522c8049f9eb946ae683e536abe..be5c0a860599b16264ab95abd75f51776116aafc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,8 @@
 #
 # Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
 #
 #
 # Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
 #

+# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
+#

 # 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.
 # 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.


@@ -97,7 +99,11 @@ SCRIPT_PYTHON = \
 # The ones that do not have to link with lcrypto nor lz.
 SIMPLE_PROGRAMS = \
        git-get-tar-commit-id git-mailinfo git-mailsplit git-stripspace \
 # The ones that do not have to link with lcrypto nor lz.
 SIMPLE_PROGRAMS = \
        git-get-tar-commit-id git-mailinfo git-mailsplit git-stripspace \

-       git-daemon git-var
+       git-var
+ifndef NO_IPV6
+# Not supported to IPv6-challenged platforms yet
+SIMPLE_PROGRAMS += git-daemon
+endif

 
 # ... and all the rest
 PROGRAMS = \
 
 # ... and all the rest
 PROGRAMS = \


@@ -175,6 +181,7 @@ endif
 ifeq ($(shell uname -o),Cygwin)
        NO_STRCASESTR = YesPlease
        NEEDS_LIBICONV = YesPlease
 ifeq ($(shell uname -o),Cygwin)
        NO_STRCASESTR = YesPlease
        NEEDS_LIBICONV = YesPlease

+       NO_IPV6 = YesPlease

 endif
 ifneq (,$(findstring arm,$(shell uname -m)))
        ARM_SHA1 = YesPlease
 endif
 ifneq (,$(findstring arm,$(shell uname -m)))
        ARM_SHA1 = YesPlease


@@ -231,6 +238,9 @@ ifdef NO_STRCASESTR
        DEFINES += -Dstrcasestr=gitstrcasestr
        LIB_OBJS += compat/strcasestr.o
 endif
        DEFINES += -Dstrcasestr=gitstrcasestr
        LIB_OBJS += compat/strcasestr.o
 endif

+ifdef NO_IPV6
+       DEFINES += -DNO_IPV6
+endif

 
 ifdef PPC_SHA1
        SHA1_HEADER = "ppc/sha1.h"
 
 ifdef PPC_SHA1
        SHA1_HEADER = "ppc/sha1.h"

diff --git a/connect.c b/connect.c
index 0e6f27ea0a07ef0ba9b339c447271b337a9e5a5b..39d320ce280f4448b52865cc5386acc2099744c7 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -290,7 +290,7 @@ static enum protocol get_protocol(const char *name)
 #define STR_(s)        # s
 #define STR(s) STR_(s)
 
 #define STR_(s)        # s
 #define STR(s) STR_(s)
 

-#ifndef __CYGWIN__
+#ifndef NO_IPV6

 
 static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
 {
 
 static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
 {


@@ -348,7 +348,7 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
        return 0;
 }
 
        return 0;
 }
 

-#else /* __CYGWIN__ */
+#else /* NO_IPV6 */

 
 static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
 {
 
 static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
 {


@@ -417,7 +417,7 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
        return 0;
 }
 
        return 0;
 }
 

-#endif /* __CYGWIN__ */
+#endif /* NO_IPV6 */

 
 /*
  * Yeah, yeah, fixme. Need to pass in the heads etc.
 
 /*
  * Yeah, yeah, fixme. Need to pass in the heads etc.