2003-03-03 Dick Porter <dick@ximian.com>

	* socket-io.c (create_sockaddr_from_object): Rename sockaddr_un
	variable so it compiles on solaris.  Problem spotted by
	Christopher Taylor <ct@cs.clemson.edu>

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 808bb4a305616698d24852d5bee96b9e89c2c286..5b2c149e895b5f1922fe1cf3762091938911145b 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-03  Dick Porter  <dick@ximian.com>
+
+       * socket-io.c (create_sockaddr_from_object): Rename sockaddr_un
+       variable so it compiles on solaris.  Problem spotted by
+       Christopher Taylor <ct@cs.clemson.edu>
 
 2003-03-01  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index d1a39cc45e959ea834ef8c5eacafed3956ac4456..1efb2c1583d8f59af4ac0f4e00102872317aa7eb 100644 (file)
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -761,19 +761,20 @@ static struct sockaddr *create_sockaddr_from_object(MonoObject *saddr_obj,
                return((struct sockaddr *)sa);
 #ifdef HAVE_SYS_UN_H
        } else if (family == AF_UNIX) {
-               struct sockaddr_un *sun = g_new0 (struct sockaddr_un, 1);
+               struct sockaddr_un *sock_un = g_new0 (struct sockaddr_un, 1);
                int i;
 
                if (len - 2 > MONO_SIZEOF_SUNPATH)
                        mono_raise_exception (mono_get_exception_index_out_of_range ());
 
-               sun->sun_family = family;
+               sock_un->sun_family = family;
                for (i = 0; i < len - 2; i++)
-                       sun->sun_path [i] = mono_array_get (data, guint8, i + 2);
-               sun->sun_path [len - 2] = '\0';
+                       sock_un->sun_path [i] = mono_array_get (data, guint8,
+                                                               i + 2);
+               sock_un->sun_path [len - 2] = '\0';
                *sa_size = sizeof (struct sockaddr_un);
 
-               return (struct sockaddr *)sun;
+               return (struct sockaddr *)sock_un;
 #endif
        } else {
                mono_raise_exception(get_socket_exception(WSAEAFNOSUPPORT));