Merge branch 'master' into config-checks-ipv6

diff --cc mono/metadata/w32socket.c
index 3f47bdf7c6a520040ee929c0821451138ce368e6,a6ec8739afed677df655554f9063c689ca5538d9..4775c4dfe805c4d1eaf65a668f83a017e717579b
--- 1/mono/metadata/w32socket.c
--- 2/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;