2010-04-26 Zoltan Varga <[email protected]>

	* boehm-gc.c: Applied patch from Robert Nagy ([email protected]). Include
	string.h for memmove.

	socket-io.c: Applied patch from Robert Nagy ([email protected]).
	ipaddress_to_struct_in6_addr() is only needed when
	defined(HAVE_STRUCT_IP_MREQN) || defined(HAVE_STRUCT_IP_MREQ).

svn path=/branches/mono-2-6/mono/; revision=156095

Author: vargaz

mono/metadata/ChangeLog

@@ -1,3 +1,12 @@
+2010-04-26  Zoltan Varga  <[email protected]>
+
+	* boehm-gc.c: Applied patch from Robert Nagy ([email protected]). Include
+	string.h for memmove.
+
+	socket-io.c: Applied patch from Robert Nagy ([email protected]).
+	ipaddress_to_struct_in6_addr() is only needed when
+	defined(HAVE_STRUCT_IP_MREQN) || defined(HAVE_STRUCT_IP_MREQ).
+
 2010-04-25  Zoltan Varga  <[email protected]>
 
 	* class.c (mono_class_create_from_typedef): Initialize class->nested_in after

mono/metadata/boehm-gc.c

@@ -6,6 +6,9 @@
  */
 
 #include "config.h"
+
+#include <string.h>
+
 #define GC_I_HIDE_POINTERS
 #include <mono/metadata/gc-internal.h>
 #include <mono/metadata/mono-gc.h>

mono/metadata/socket-io.c

@@ -1934,7 +1934,6 @@ static struct in_addr ipaddress_to_struct_in_addr(MonoObject *ipaddr)
 
 	return(inaddr);
 }
-#endif
 
 #ifdef AF_INET6
 static struct in6_addr ipaddress_to_struct_in6_addr(MonoObject *ipaddr)
@@ -1961,6 +1960,7 @@ static struct in6_addr ipaddress_to_struct_in6_addr(MonoObject *ipaddr)
 	return(in6addr);
 }
 #endif /* AF_INET6 */
+#endif
 
 void ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal(SOCKET sock, gint32 level, gint32 name, MonoObject *obj_val, MonoArray *byte_val, gint32 int_val, gint32 *error)
 {