don't bother wrapping IP_[ADD,DROP]_MEMBERSHIP with ifdefs since

solaris does have these afterall.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 1534f264fe981d593705272d6412725d6b198cc6..219661e67b0861bc5be39ee3f068120c92a335fe 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -11,10 +11,9 @@
        getprotobyname() and caching the values (because this could be a
        slow operation).
        (ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal):
-       Don't attempt to add or drop memberships unless the system
-       supports it. Also use the appropriate struct when the system does
-       support it. Ie, not all systems have struct ip_mreqn so use struct
-       ip_mreq when appropriate.
+       Use the appropriate struct when the system does support it. Ie,
+       not all systems have struct ip_mreqn so use struct ip_mreq when
+       appropriate.
 
 Fri Feb 15 18:15:44 CET 2002 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index 2acfb158aae2dca20c34a5b17bf8015629253746..64465a1c2eaf2311d84f8455d53927e6a755cc81 100644 (file)
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -1146,13 +1146,8 @@ void ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal(SOCKET sock, g
                        ret=setsockopt(sock, system_level, system_name,
                                       &linger, valsize);
                        break;
-#ifdef HAVE_IP_ADD_MEMBERSHIP
                case SocketOptionName_AddMembership:
-#endif
-#ifdef HAVE_IP_DROP_MEMBERSHIP
                case SocketOptionName_DropMembership:
-#endif
-#if defined (HAVE_IP_ADD_MEMBERSHIP) || defined (HAVE_IP_DROP_MEMBERSHIP)
                {
 #ifdef HAVE_STRUCT_IP_MREQN
                        struct ip_mreqn mreq;
@@ -1180,7 +1175,6 @@ void ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal(SOCKET sock, g
                                          &mreq, sizeof (mreq));
                        break;
                }
-#endif /* HAVE_IP_[ADD,DROP]_MEMBERSHIP */
                default:
                        /* Throw an exception */
                        mono_raise_exception(get_socket_exception(WSAEINVAL));