summaryrefslogtreecommitdiffstats
path: root/otherlibs/unix
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2014-08-22 13:45:02 +0000
committerDamien Doligez <damien.doligez-inria.fr>2014-08-22 13:45:02 +0000
commitcbfe627f925ab2bab93bae7a7bc9f6ee6afb8637 (patch)
treeaf5ec283ac3175b1ab95dd745dbd05f2298b9da6 /otherlibs/unix
parent09ad9c1abbe6bee443a55379223280dab3de4749 (diff)
merge changes from branch 4.02 from branching (rev 14852) to 4.02.0+rc1 (rev 15121)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15125 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/unix')
-rw-r--r--otherlibs/unix/.depend7
-rw-r--r--otherlibs/unix/unix.mli6
2 files changed, 9 insertions, 4 deletions
diff --git a/otherlibs/unix/.depend b/otherlibs/unix/.depend
index 63e1d2293..85eee1b85 100644
--- a/otherlibs/unix/.depend
+++ b/otherlibs/unix/.depend
@@ -137,8 +137,8 @@ getaddrinfo.o: getaddrinfo.c ../../byterun/mlvalues.h \
../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
../../byterun/major_gc.h ../../byterun/freelist.h \
- ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
- cst2constr.h socketaddr.h ../../byterun/misc.h
+ ../../byterun/minor_gc.h ../../byterun/misc.h ../../byterun/signals.h \
+ unixsupport.h cst2constr.h socketaddr.h
getcwd.o: getcwd.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
../../byterun/config.h ../../byterun/../config/m.h \
../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
@@ -301,7 +301,8 @@ open.o: open.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
../../byterun/major_gc.h ../../byterun/freelist.h \
- ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+ ../../byterun/minor_gc.h ../../byterun/misc.h ../../byterun/signals.h \
+ unixsupport.h
opendir.o: opendir.c ../../byterun/mlvalues.h \
../../byterun/compatibility.h ../../byterun/config.h \
../../byterun/../config/m.h ../../byterun/../config/s.h \
diff --git a/otherlibs/unix/unix.mli b/otherlibs/unix/unix.mli
index 59e519935..bd68f8c7b 100644
--- a/otherlibs/unix/unix.mli
+++ b/otherlibs/unix/unix.mli
@@ -11,7 +11,11 @@
(* *)
(***********************************************************************)
-(** Interface to the Unix system *)
+(** Interface to the Unix system.
+
+ Note: all the functions of this module (except [error_message] and
+ [handle_unix_error]) are liable to raise the [Unix_error]
+ exception whenever the underlying system call signals an error. *)
(** {6 Error report} *)