summaryrefslogtreecommitdiffstats
path: root/otherlibs/unix
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1996-04-29 13:22:30 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1996-04-29 13:22:30 +0000
commitff2f0ba86fd1ad7241c52a07c2a317b5cb404364 (patch)
treea82428c0a57ea1d478e07f78f512f9bdeaa91c8e /otherlibs/unix
parent69114fecce8a5b072bc19993757476087505f7b5 (diff)
Makefile: utilisation option -linkall.
unix: reformatage commentaire. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@768 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/unix')
-rw-r--r--otherlibs/unix/Makefile4
-rw-r--r--otherlibs/unix/unix.mli4
2 files changed, 4 insertions, 4 deletions
diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile
index 3cb2b1292..1508e994a 100644
--- a/otherlibs/unix/Makefile
+++ b/otherlibs/unix/Makefile
@@ -33,10 +33,10 @@ libunix.a: $(OBJS)
$(RANLIB) libunix.a
unix.cma: unix.cmo
- $(CAMLC) -a -o unix.cma unix.cmo
+ $(CAMLC) -a -linkall -o unix.cma unix.cmo
unix.cmxa: unix.cmx
- $(CAMLOPT) -a -o unix.cmxa unix.cmx
+ $(CAMLOPT) -a -linkall -o unix.cmxa unix.cmx
unix.cmx: ../../cslopt
diff --git a/otherlibs/unix/unix.mli b/otherlibs/unix/unix.mli
index ce92951d4..9fe7dd1f2 100644
--- a/otherlibs/unix/unix.mli
+++ b/otherlibs/unix/unix.mli
@@ -541,8 +541,8 @@ external getitimer: interval_timer -> interval_timer_status = "unix_getitimer"
external setitimer:
interval_timer -> interval_timer_status -> interval_timer_status
= "unix_setitimer"
- (* [setitimer t s] set the interval timer [t] and return its previous
- status. The [s] argument is interpreted as follows:
+ (* [setitimer t s] sets the interval timer [t] and returns
+ its previous status. The [s] argument is interpreted as follows:
[s.it_value], if nonzero, is the time to the next timer expiration;
[s.it_interval], if nonzero, specifies a value to
be used in reloading it_value when the timer expires.