2010-04-26 Zoltan Varga <vargaz@gmail.com>

	* boehm-gc.c: Applied patch from Robert Nagy (robert@openbsd.org). Include
	string.h for memmove.

	socket-io.c: Applied patch from Robert Nagy (robert@openbsd.org).
	ipaddress_to_struct_in6_addr() is only needed when
	defined(HAVE_STRUCT_IP_MREQN) || defined(HAVE_STRUCT_IP_MREQ).

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 760f51b378b140fcd0a257da45f0a9d96d4eedc9..150b98a10c85eccb6d1cc250a9afb49ae72f00bd 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-26  Zoltan Varga  <vargaz@gmail.com>
+
+       * boehm-gc.c: Applied patch from Robert Nagy (robert@openbsd.org). Include
+       string.h for memmove.
+
+       socket-io.c: Applied patch from Robert Nagy (robert@openbsd.org).
+       ipaddress_to_struct_in6_addr() is only needed when
+       defined(HAVE_STRUCT_IP_MREQN) || defined(HAVE_STRUCT_IP_MREQ).
+
 2010-04-25  Mark Probst  <mark.probst@gmail.com>
 
        * sgen-gc.c, sgen-marksweep.c, sgen-major-copying.c: Properly

diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c
index add65bfa01e9e5e48d74d83ba33a5607d44d41e2..c1f38cdbc43dc0728768b4dbc73d3d53805f6592 100644 (file)
--- a/mono/metadata/boehm-gc.c
+++ b/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>

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index 070880498815c68a33ea9fa8f25680659856c4d8..53dd0d8b13cb13f2c2bf9707771ac059a13b0102 100644 (file)
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -1944,7 +1944,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)
@@ -1971,6 +1970,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)
 {