7 files changed, 36 insertions, 24 deletions
diff --git a/otherlibs/dynlink/.cvsignore b/otherlibs/dynlink/.cvsignore
index 5ea9775e1d..29b3102d19 100644
--- a/otherlibs/dynlink/.cvsignore
+++ b/otherlibs/dynlink/.cvsignore
@@ -1 +1,2 @@
 extract_crc
+*.a
diff --git a/otherlibs/graph/.cvsignore b/otherlibs/graph/.cvsignore
index 074dd28a45..29fea47264 100644
--- a/otherlibs/graph/.cvsignore
+++ b/otherlibs/graph/.cvsignore
@@ -1 +1,3 @@
 so_locations
+*.so
+*.a
diff --git a/otherlibs/systhreads/.cvsignore b/otherlibs/systhreads/.cvsignore
index b175e39d68..1f1e6a3877 100644
--- a/otherlibs/systhreads/.cvsignore
+++ b/otherlibs/systhreads/.cvsignore
@@ -1,3 +1,5 @@
 *.x
 thread.ml
 so_locations
+*.so
+*.a
diff --git a/otherlibs/threads/.cvsignore b/otherlibs/threads/.cvsignore
index fb2df562de..c17596c7d0 100644
--- a/otherlibs/threads/.cvsignore
+++ b/otherlibs/threads/.cvsignore
@@ -1,3 +1,5 @@
 marshal.mli
 pervasives.mli
 unix.mli
+*.so
+*.a
diff --git a/otherlibs/threads/.depend b/otherlibs/threads/.depend
index 8d262a6a1f..38f2d528d2 100644
--- a/otherlibs/threads/.depend
+++ b/otherlibs/threads/.depend
@@ -22,24 +22,21 @@ event.cmi:
 join_debug.cmi: 
 join_extern.cmi: thread.cmi 
 join_hash.cmi: 
-join_link.cmi: unix.cmi 
+join_link.cmi: unix.cmo 
 join_message.cmi: join_types.cmi join_link.cmi 
-join_misc.cmi: unix.cmi marshal.cmi 
-join_port.cmi: unix.cmi join_link.cmi 
+join_misc.cmi: unix.cmo marshal.cmo 
+join_port.cmi: unix.cmo join_link.cmi 
 join_prim.cmi: join_types.cmi 
 join_queue.cmi: 
 join_scheduler.cmi: mutex.cmi join_types.cmi 
 join_set.cmi: 
-join_space.cmi: unix.cmi marshal.cmi join_types.cmi 
-join_test.cmi: marshal.cmi join_types.cmi 
-join_types.cmi: unix.cmi mutex.cmi join_set.cmi join_misc.cmi join_link.cmi \
+join_space.cmi: unix.cmo marshal.cmo join_types.cmi 
+join_test.cmi: marshal.cmo join_types.cmi 
+join_types.cmi: unix.cmo mutex.cmi join_set.cmi join_misc.cmi join_link.cmi \
     join_hash.cmi condition.cmi 
-marshal.cmi: 
 mutex.cmi: 
-pervasives.cmi: 
-thread.cmi: unix.cmi 
-threadUnix.cmi: unix.cmi 
-unix.cmi: 
+thread.cmi: unix.cmo 
+threadUnix.cmi: unix.cmo 
 condition.cmo: thread.cmi mutex.cmi condition.cmi 
 condition.cmx: thread.cmx mutex.cmx condition.cmi 
 event.cmo: mutex.cmi condition.cmi event.cmi 
@@ -50,15 +47,15 @@ join_extern.cmo: thread.cmi join_extern.cmi
 join_extern.cmx: thread.cmx join_extern.cmi 
 join_hash.cmo: join_misc.cmi join_hash.cmi 
 join_hash.cmx: join_misc.cmx join_hash.cmi 
-join_link.cmo: unix.cmi join_misc.cmi join_debug.cmi join_link.cmi 
+join_link.cmo: unix.cmo join_misc.cmi join_debug.cmi join_link.cmi 
 join_link.cmx: unix.cmx join_misc.cmx join_debug.cmx join_link.cmi 
-join_message.cmo: marshal.cmi join_types.cmi join_link.cmi join_hash.cmi \
+join_message.cmo: marshal.cmo join_types.cmi join_link.cmi join_hash.cmi \
     join_debug.cmi join_message.cmi 
 join_message.cmx: marshal.cmx join_types.cmi join_link.cmx join_hash.cmx \
     join_debug.cmx join_message.cmi 
-join_misc.cmo: unix.cmi mutex.cmi join_debug.cmi condition.cmi join_misc.cmi 
+join_misc.cmo: unix.cmo mutex.cmi join_debug.cmi condition.cmi join_misc.cmi 
 join_misc.cmx: unix.cmx mutex.cmx join_debug.cmx condition.cmx join_misc.cmi 
-join_port.cmo: unix.cmi join_scheduler.cmi join_misc.cmi join_link.cmi \
+join_port.cmo: unix.cmo join_scheduler.cmi join_misc.cmi join_link.cmi \
     join_debug.cmi join_port.cmi 
 join_port.cmx: unix.cmx join_scheduler.cmx join_misc.cmx join_link.cmx \
     join_debug.cmx join_port.cmi 
@@ -74,7 +71,7 @@ join_scheduler.cmx: thread.cmx mutex.cmx join_types.cmi join_misc.cmx \
     join_extern.cmx join_debug.cmx condition.cmx join_scheduler.cmi 
 join_set.cmo: mutex.cmi join_misc.cmi join_set.cmi 
 join_set.cmx: mutex.cmx join_misc.cmx join_set.cmi 
-join_space.cmo: unix.cmi thread.cmi pervasives.cmi mutex.cmi marshal.cmi \
+join_space.cmo: unix.cmo thread.cmi pervasives.cmo mutex.cmi marshal.cmo \
     join_types.cmi join_set.cmi join_scheduler.cmi join_port.cmi \
     join_misc.cmi join_message.cmi join_link.cmi join_hash.cmi join_debug.cmi \
     condition.cmi join_space.cmi 
@@ -84,15 +81,15 @@ join_space.cmx: unix.cmx thread.cmx pervasives.cmx mutex.cmx marshal.cmx \
     condition.cmx join_space.cmi 
 join_test.cmo: join_space.cmi join_test.cmi 
 join_test.cmx: join_space.cmx join_test.cmi 
-marshal.cmo: pervasives.cmi marshal.cmi 
-marshal.cmx: pervasives.cmx marshal.cmi 
+marshal.cmo: pervasives.cmo 
+marshal.cmx: pervasives.cmx 
 mutex.cmo: thread.cmi mutex.cmi 
 mutex.cmx: thread.cmx mutex.cmi 
-pervasives.cmo: unix.cmi pervasives.cmi 
-pervasives.cmx: unix.cmx pervasives.cmi 
-thread.cmo: unix.cmi thread.cmi 
+pervasives.cmo: unix.cmo 
+pervasives.cmx: unix.cmx 
+thread.cmo: unix.cmo thread.cmi 
 thread.cmx: unix.cmx thread.cmi 
-threadUnix.cmo: unix.cmi thread.cmi threadUnix.cmi 
+threadUnix.cmo: unix.cmo thread.cmi threadUnix.cmi 
 threadUnix.cmx: unix.cmx thread.cmx threadUnix.cmi 
-unix.cmo: unix.cmi 
-unix.cmx: unix.cmi 
+unix.cmo: 
+unix.cmx: 
diff --git a/otherlibs/unix/.cvsignore b/otherlibs/unix/.cvsignore
index 074dd28a45..29fea47264 100644
--- a/otherlibs/unix/.cvsignore
+++ b/otherlibs/unix/.cvsignore
@@ -1 +1,3 @@
 so_locations
+*.so
+*.a
diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c
index 0ee1cf5ee1..f285d15a7b 100644
--- a/otherlibs/unix/socketaddr.c
+++ b/otherlibs/unix/socketaddr.c
@@ -80,6 +80,9 @@ void get_sockaddr(value mladr,
       adr->s_inet6.sin6_family = AF_INET6;
       adr->s_inet6.sin6_addr = GET_INET6_ADDR(Field(mladr, 0));
       adr->s_inet6.sin6_port = htons(Int_val(Field(mladr, 1)));
+#ifdef SIN6_LEN
+      adr->s_inet6.sin6_len = sizeof(struct sockaddr_in6);
+#endif
       *adr_len = sizeof(struct sockaddr_in6);
       break;
     }
@@ -88,6 +91,9 @@ void get_sockaddr(value mladr,
     adr->s_inet.sin_family = AF_INET;
     adr->s_inet.sin_addr = GET_INET_ADDR(Field(mladr, 0));
     adr->s_inet.sin_port = htons(Int_val(Field(mladr, 1)));
+#ifdef SIN6_LEN
+    adr->s_inet.sin_len = sizeof(struct sockaddr_in);
+#endif
     *adr_len = sizeof(struct sockaddr_in);
     break;
   }