2004-04-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* socket-io.c: don't display the non-supported family warning for known
	families. Now this is not displayed on windows when checking support
	for IPv4/IPv6.

svn path=/trunk/mono/; revision=25809

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index eb60a6a6bbd5c1c0d3b6b22a0b46980c36936bde..b1f848259c986a05604e9bea3540948a34bb2d68 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * socket-io.c: don't display the non-supported family warning for known
+       families. Now this is not displayed on windows when checking support
+       for IPv4/IPv6.
+
 2004-04-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * class.c: don't display the layout warning for static fields.

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index fc6c70be352403ba9f531e731d9cf6d60c2d50ad..0c4dcf3fc3217386e47ba4934088b6313eb75a07 100644 (file)
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -89,11 +89,11 @@ static gint32 convert_family(MonoAddressFamily mono_family)
                family=AF_INET;
                break;
                
-#ifdef AF_IPX
        case AddressFamily_Ipx:
+#ifdef AF_IPX
                family=AF_IPX;
-               break;
 #endif
+               break;
                
        case AddressFamily_Sna:
                family=AF_SNA;
@@ -107,16 +107,16 @@ static gint32 convert_family(MonoAddressFamily mono_family)
                family=AF_APPLETALK;
                break;
                
-#ifdef AF_INET6
        case AddressFamily_InterNetworkV6:
+#ifdef AF_INET6
                family=AF_INET6;
-               break;
 #endif
-#ifdef AF_IRDA 
+               break;
        case AddressFamily_Irda:
+#ifdef AF_IRDA 
                family=AF_IRDA;
-               break;
 #endif
+               break;
        default:
                g_warning("System.Net.Sockets.AddressFamily has unknown value 0x%x", mono_family);
        }