Fix compile on cygwin. This isnt the solution I would like: I would prefer to get...

svn:r1326

diff --git a/evutil.c b/evutil.c
index 5b3803445877d2e4291535f4f7cf6a05b38ad749..5f8f9b9aee219376fb3f779c8b4022849f84cd26 100644 (file)
--- a/evutil.c
+++ b/evutil.c
@@ -644,7 +644,9 @@ evutil_parse_sockaddr_port(const char *ip_as_string, struct sockaddr *out, int *
 
        if (!addr_part)
                return -1; /* Should be impossible. */
-       if (is_ipv6) {
+#ifdef AF_INET6
+       if (is_ipv6)
+       {
                struct sockaddr_in6 sin6;
                memset(&sin6, 0, sizeof(sin6));
 #ifdef _EVENT_HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
@@ -660,7 +662,10 @@ evutil_parse_sockaddr_port(const char *ip_as_string, struct sockaddr *out, int *
                memcpy(out, &sin6, sizeof(sin6));
                 *outlen = sizeof(sin6);
                return 0;
-       } else {
+       }
+       else
+#endif
+       {
                struct sockaddr_in sin;
                memset(&sin, 0, sizeof(sin));
 #ifdef _EVENT_HAVE_STRUCT_SOCKADDR_IN_SIN_LEN

diff --git a/ipv6-internal.h b/ipv6-internal.h
index f1b3422640bd983b19cfc54d92f9ccf60a537ca4..3cdcea6254d180b870869b376b5ebaf587072129 100644 (file)
--- a/ipv6-internal.h
+++ b/ipv6-internal.h
@@ -31,6 +31,9 @@
 #define _EVENT_IPV6_INTERNAL_H
 
 #include <sys/types.h>
+#ifdef _EVENT_HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #include "event-config.h"
 #include <event2/util.h>