From: Joshua Peterson <petersonjm1@gmail.com>
Date: Tue, 25 Apr 2017 13:28:15 +0000 (-0400)
Subject: Merge branch 'master' into config-checks-ipv6
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=3e6c4f526499a339783cbe427e9916bbd99d7a0e

Merge branch 'master' into config-checks-ipv6
---

3e6c4f526499a339783cbe427e9916bbd99d7a0e
diff --cc mono/metadata/w32socket.c
index 3f47bdf7c6a,a6ec8739afe..4775c4dfe80
--- a/mono/metadata/w32socket.c
+++ b/mono/metadata/w32socket.c
@@@ -204,13 -204,13 +204,17 @@@ convert_family (MonoAddressFamily mono_
  	case AddressFamily_InterNetwork:
  		return AF_INET;
  	case AddressFamily_AppleTalk:
+ #ifdef AF_APPLETALK
  		return AF_APPLETALK;
+ #else
+ 		return -1;
+ #endif
  	case AddressFamily_InterNetworkV6:
 +#ifdef HAVE_STRUCT_SOCKADDR_IN6
  		return AF_INET6;
 +#else
 +		return -1;
 +#endif
  	case AddressFamily_DecNet:
  #ifdef AF_DECnet
  		return AF_DECnet;
@@@ -263,12 -263,12 +267,14 @@@ convert_to_mono_family (guint16 af_fami
  	case AF_DECnet:
  		return AddressFamily_DecNet;
  #endif
+ #ifdef AF_APPLETALK
  	case AF_APPLETALK:
  		return AddressFamily_AppleTalk;
+ #endif
 +#ifdef HAVE_STRUCT_SOCKADDR_IN6
  	case AF_INET6:
- #endif
  		return AddressFamily_InterNetworkV6;
++#endif
  #ifdef AF_IRDA
  	case AF_IRDA:
  		return AddressFamily_Irda;