Merge branch 'master' into dnssec

This commit is contained in:
Simon Kelley
2013-11-14 10:39:40 +00:00
15 changed files with 353 additions and 188 deletions

View File

@@ -255,7 +255,10 @@ HAVE_SOCKADDR_SA_LEN
#define HAVE_SOCKADDR_SA_LEN
/* Define before sys/socket.h is included so we get socklen_t */
#define _BSD_SOCKLEN_T_
/* Select the RFC_3542 version of the IPv6 socket API.
Define before netinet6/in6.h is included. */
#define __APPLE_USE_RFC_3542
#elif defined(__NetBSD__)
#define HAVE_BSD_NETWORK
#define HAVE_GETOPT_LONG