@@ -2878,8 +2878,7 @@ struct openvpn_in4_pktinfo

   struct cmsghdr cmsghdr;

 #ifdef HAVE_IN_PKTINFO

   struct in_pktinfo pi4;

-#endif

-#ifdef IP_RECVDSTADDR

+#elif defined(IP_RECVDSTADDR)

   struct in_addr pi4;

 #endif

 };

@@ -86,8 +86,7 @@ struct link_socket_actual

   union {

 #ifdef HAVE_IN_PKTINFO

     struct in_pktinfo in4;

-#endif

-#ifdef IP_RECVDSTADDR

+#elif defined(IP_RECVDSTADDR)

     struct in_addr in4;

 #endif

     struct in6_pktinfo in6;

@@ -589,8 +588,7 @@ addr_defined_ipi (const struct link_socket_actual *lsa)

   switch (lsa->dest.addr.sa.sa_family) {

 #ifdef HAVE_IN_PKTINFO

     case AF_INET: return lsa->pi.in4.ipi_spec_dst.s_addr != 0;

-#endif

-#ifdef IP_RECVDSTADDR

+#elif defined(IP_RECVDSTADDR)

     case AF_INET: return lsa->pi.in4.s_addr != 0;

 #endif

     case AF_INET6: return !IN6_IS_ADDR_UNSPECIFIED(&lsa->pi.in6.ipi6_addr);

@@ -57,6 +57,12 @@

 #define srandom srand

 #endif

+#if defined(__APPLE__)

+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1070

+#define __APPLE_USE_RFC_3542  1

+#endif

+#endif

+

 #ifdef HAVE_SYS_TYPES_H

 #include <sys/types.h>

 #endif

@@ -401,6 +407,14 @@

 #endif

 /*

+ * Does this platform define SOL_IP

+ * or only bsd-style IPPROTO_IP ?

+ */

+#ifndef SOL_IP

+#define SOL_IP IPPROTO_IP

+#endif

+

+/*

  * Disable ESEC

  */

 #if 0

@@ -1060,11 +1060,11 @@ do_ifconfig (struct tuntap *tt,

 	{

 	  struct route r;

 	  CLEAR (r);

-	  r.defined = true;

+	  r.flags = RT_DEFINED;

 	  r.network = tt->local & tt->remote_netmask;

 	  r.netmask = tt->remote_netmask;

 	  r.gateway = tt->local;

-	  add_route (&r, tt, 0, es);

+	  add_route (&r, tt, 0, NULL, es);

 	}

       if ( do_ipv6 )