7 files changed, 45 insertions, 22 deletions
diff --git a/otherlibs/win32unix/accept.c b/otherlibs/win32unix/accept.c
index 0ef5d4d6c..fcd3fa514 100644
--- a/otherlibs/win32unix/accept.c
+++ b/otherlibs/win32unix/accept.c
@@ -25,6 +25,8 @@ value unix_accept(sock)          /* ML */
   SOCKET snew;
   value fd = Val_unit, adr = Val_unit, res;
   int oldvalue, oldvaluelen, newvalue, retcode;
+  union sock_addr_union addr;
+  socklen_param_type addr_len;
 
   oldvaluelen = sizeof(oldvalue);
   retcode = getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
@@ -35,9 +37,9 @@ value unix_accept(sock)          /* ML */
     setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, 
                (char *) &newvalue, sizeof(newvalue));
   }
-  sock_addr_len = sizeof(sock_addr);
+  addr_len = sizeof(sock_addr);
   enter_blocking_section();
-  snew = accept(sconn, &sock_addr.s_gen, &sock_addr_len);
+  snew = accept(sconn, &addr.s_gen, &addr_len);
   leave_blocking_section();
   if (retcode == 0) {
     /* Restore initial mode */
@@ -48,7 +50,7 @@ value unix_accept(sock)          /* ML */
     unix_error(WSAGetLastError(), "accept", Nothing);
   Begin_roots2 (fd, adr)
     fd = win_alloc_handle((HANDLE) snew);
-    adr = alloc_sockaddr();
+    adr = alloc_sockaddr(&addr, addr_len);
     res = alloc_small(2, 0);
     Field(res, 0) = fd;
     Field(res, 1) = adr;
diff --git a/otherlibs/win32unix/bind.c b/otherlibs/win32unix/bind.c
index a4f45b1e9..58e4b60e0 100644
--- a/otherlibs/win32unix/bind.c
+++ b/otherlibs/win32unix/bind.c
@@ -20,8 +20,11 @@ value unix_bind(socket, address)      /* ML */
      value socket, address;
 {
   int ret;
-  get_sockaddr(address);
-  ret = bind((SOCKET) Handle_val(socket), &sock_addr.s_gen, sock_addr_len);
+  union sock_addr_union addr;
+  socklen_param_type addr_len;
+
+  get_sockaddr(address, &addr, &addr_len);
+  ret = bind((SOCKET) Handle_val(socket), &addr.s_gen, addr_len);
   if (ret == -1) unix_error(WSAGetLastError(), "bind", Nothing);
   return Val_unit;
 }
diff --git a/otherlibs/win32unix/connect.c b/otherlibs/win32unix/connect.c
index 24380582b..dabcc4e84 100644
--- a/otherlibs/win32unix/connect.c
+++ b/otherlibs/win32unix/connect.c
@@ -21,10 +21,12 @@ value unix_connect(socket, address)   /* ML */
 {
   SOCKET s = (SOCKET) Handle_val(socket);
   int retcode;
+  union sock_addr_union addr;
+  socklen_param_type addr_len;
 
-  get_sockaddr(address);
+  get_sockaddr(address, &addr, &addr_len);
   enter_blocking_section();
-  retcode = connect(s, &sock_addr.s_gen, sock_addr_len);
+  retcode = connect(s, &addr.s_gen, addr_len);
   leave_blocking_section();
   if (retcode == -1) unix_error(WSAGetLastError(), "connect", Nothing);
   return Val_unit;
diff --git a/otherlibs/win32unix/getpeername.c b/otherlibs/win32unix/getpeername.c
index bcdb80135..9bf4ee69f 100644
--- a/otherlibs/win32unix/getpeername.c
+++ b/otherlibs/win32unix/getpeername.c
@@ -20,10 +20,12 @@ value unix_getpeername(sock)          /* ML */
      value sock;
 {
   int retcode;
+  union sock_addr_union addr;
+  socklen_param_type addr_len;
 
-  sock_addr_len = sizeof(sock_addr);
+  addr_len = sizeof(sock_addr);
   retcode = getpeername((SOCKET) Handle_val(sock),
-                        &sock_addr.s_gen, &sock_addr_len);
+                        &addr.s_gen, &addr_len);
   if (retcode == -1) unix_error(WSAGetLastError(), "getpeername", Nothing);
-  return alloc_sockaddr();
+  return alloc_sockaddr(&addr, addr_len);
 }
diff --git a/otherlibs/win32unix/getsockname.c b/otherlibs/win32unix/getsockname.c
index 51b3a9f58..8faf5ba1c 100644
--- a/otherlibs/win32unix/getsockname.c
+++ b/otherlibs/win32unix/getsockname.c
@@ -20,10 +20,12 @@ value unix_getsockname(sock)          /* ML */
      value sock;
 {
   int retcode;
+  union sock_addr_union addr;
+  socklen_param_type addr_len;
 
-  sock_addr_len = sizeof(sock_addr);
+  addr_len = sizeof(sock_addr);
   retcode = getsockname((SOCKET) Handle_val(sock),
-                        &sock_addr.s_gen, &sock_addr_len);
+                        &addr.s_gen, &addr_len);
   if (retcode == -1) uerror("getsockname", Nothing);
-  return alloc_sockaddr();
+  return alloc_sockaddr(&addr, addr_len);
 }
diff --git a/otherlibs/win32unix/sendrecv.c b/otherlibs/win32unix/sendrecv.c
index 62c862d6b..46ae14fa0 100644
--- a/otherlibs/win32unix/sendrecv.c
+++ b/otherlibs/win32unix/sendrecv.c
@@ -48,20 +48,22 @@ value unix_recvfrom(value sock, value buff, value ofs, value len, value flags) /
   char iobuf[UNIX_BUFFER_SIZE];
   value res;
   value adr = Val_unit;
+  union sock_addr_union addr;
+  socklen_param_type addr_len;
 
   Begin_roots2 (buff, adr);
     numbytes = Long_val(len);
     if (numbytes > UNIX_BUFFER_SIZE) numbytes = UNIX_BUFFER_SIZE;
-    sock_addr_len = sizeof(sock_addr);
+    addr_len = sizeof(sock_addr);
     enter_blocking_section();
     ret = recvfrom((SOCKET) Handle_val(sock),
                    iobuf, (int) numbytes,
                    convert_flag_list(flags, msg_flag_table),
-                   &sock_addr.s_gen, &sock_addr_len);
+                   &addr.s_gen, &addr_len);
     leave_blocking_section();
     if (ret == -1) unix_error(WSAGetLastError(), "recvfrom", Nothing);
     bcopy(iobuf, &Byte(buff, Long_val(ofs)), ret);
-    adr = alloc_sockaddr();
+    adr = alloc_sockaddr(&addr, addr_len);
     res = alloc_small(2, 0);
     Field(res, 0) = Val_int(ret);
     Field(res, 1) = adr;
@@ -91,8 +93,10 @@ value unix_sendto_native(value sock, value buff, value ofs, value len, value fla
   int ret;
   long numbytes;
   char iobuf[UNIX_BUFFER_SIZE];
+  union sock_addr_union addr;
+  socklen_param_type addr_len;
 
-  get_sockaddr(dest);
+  get_sockaddr(dest, &addr, &addr_len);
   numbytes = Long_val(len);
   if (numbytes > UNIX_BUFFER_SIZE) numbytes = UNIX_BUFFER_SIZE;
   bcopy(&Byte(buff, Long_val(ofs)), iobuf, numbytes);
@@ -100,7 +104,7 @@ value unix_sendto_native(value sock, value buff, value ofs, value len, value fla
   ret = sendto((SOCKET) Handle_val(sock),
                iobuf, (int) numbytes,
                convert_flag_list(flags, msg_flag_table),
-               &sock_addr.s_gen, sock_addr_len);
+               &addr.s_gen, addr_len);
   leave_blocking_section();
   if (ret == -1) unix_error(WSAGetLastError(), "sendto", Nothing);
   return Val_int(ret);
diff --git a/otherlibs/win32unix/socketaddr.h b/otherlibs/win32unix/socketaddr.h
index d210bb204..f244d82fd 100644
--- a/otherlibs/win32unix/socketaddr.h
+++ b/otherlibs/win32unix/socketaddr.h
@@ -22,10 +22,18 @@ union sock_addr_union {
 };
 
 extern union sock_addr_union sock_addr;
-extern int sock_addr_len;
 
-void get_sockaddr (value);
-value alloc_sockaddr (void);
-value alloc_inet_addr (unsigned int);
+#ifdef HAS_SOCKLEN_T
+typedef socklen_t socklen_param_type;
+#else
+typedef int socklen_param_type;
+#endif
+
+void get_sockaddr (value mladdr,
+                   union sock_addr_union * addr /*out*/,
+                   socklen_param_type * addr_len /*out*/);
+value alloc_sockaddr (union sock_addr_union * addr /*in*/,
+                      socklen_param_type addr_len);
+value alloc_inet_addr (uint32 inaddr);
 
 #define GET_INET_ADDR(v) (*((uint32 *) (v)))