merge with trunk at rev 14512ephemeron

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/ephemeron@14514 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 6 insertions, 1 deletions

diff --git a/otherlibs/unix/closedir.c b/otherlibs/unix/closedir.c
index ba9e743754..4196acd4e1 100644
--- a/otherlibs/unix/closedir.c
+++ b/otherlibs/unix/closedir.c
@@ -12,6 +12,8 @@
 /***********************************************************************/
 
 #include <mlvalues.h>
+#include <memory.h>
+#include <signals.h>
 #include "unixsupport.h"
 #include <errno.h>
 #include <sys/types.h>
@@ -23,9 +25,12 @@
 
 CAMLprim value unix_closedir(value vd)
 {
+  CAMLparam1(vd);
   DIR * d = DIR_Val(vd);
   if (d == (DIR *) NULL) unix_error(EBADF, "closedir", Nothing);
+  caml_enter_blocking_section();
   closedir(d);
+  caml_leave_blocking_section();
   DIR_Val(vd) = (DIR *) NULL;
-  return Val_unit;
+  CAMLreturn(Val_unit);
 }