diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/Makefile | 18 | ||||
| -rw-r--r-- | stdlib/Makefile.nt | 1 | ||||
| -rw-r--r-- | stdlib/header.c | 2 | ||||
| -rw-r--r-- | stdlib/pervasives.mli | 2 | ||||
| -rw-r--r-- | stdlib/printexc.ml | 2 |
5 files changed, 12 insertions, 13 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index 76f0eac8b..874dcf6f9 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -32,7 +32,7 @@ installopt-noprof: rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa rm -f $(LIBDIR)/stdlib.p.a; ln -s stdlib.a $(LIBDIR)/stdlib.p.a rm -f $(LIBDIR)/std_exit.p.cmx; \ - ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx + ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o installopt-prof: @@ -44,16 +44,16 @@ stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx) camlheader camlheader_ur: header.c ../config/Makefile if $(SHARPBANGSCRIPTS); then \ - echo '#!$(BINDIR)/ocamlrun' > camlheader && \ - echo '#!' | tr -d '\012' > camlheader_ur; \ - else \ + echo '#!$(BINDIR)/ocamlrun' > camlheader && \ + echo '#!' | tr -d '\012' > camlheader_ur; \ + else \ $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) \ - -DRUNTIME_NAME='"$(BINDIR)/ocamlrun"' \ - header.c -o tmpheader$(EXE) && \ - strip tmpheader$(EXE) && \ + -DRUNTIME_NAME='"$(BINDIR)/ocamlrun"' \ + header.c -o tmpheader$(EXE) && \ + strip tmpheader$(EXE) && \ mv tmpheader$(EXE) camlheader && \ - cp camlheader camlheader_ur; \ - fi + cp camlheader camlheader_ur; \ + fi .PHONY: all allopt allopt-noprof allopt-prof install installopt .PHONY: installopt-default installopt-noprof installopt-prof clean depend diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt index aae1de40a..995a0c3fd 100644 --- a/stdlib/Makefile.nt +++ b/stdlib/Makefile.nt @@ -29,4 +29,3 @@ camlheader camlheader_ur: headernt.c ../config/Makefile # TODO: do not call flexlink to build tmpheader.exe (we don't need # the export table) - diff --git a/stdlib/header.c b/stdlib/header.c index 0d536be18..eda76325a 100644 --- a/stdlib/header.c +++ b/stdlib/header.c @@ -121,7 +121,7 @@ static char * searchpath(char * name) return name; } -#endif +#endif static unsigned long read_size(char * ptr) { diff --git a/stdlib/pervasives.mli b/stdlib/pervasives.mli index 7a1e68dd9..754125f9e 100644 --- a/stdlib/pervasives.mli +++ b/stdlib/pervasives.mli @@ -93,7 +93,7 @@ external compare : 'a -> 'a -> int = "%compare" the {!List.sort} and {!Array.sort} functions. *) val min : 'a -> 'a -> 'a -(** Return the smaller of the two arguments. +(** Return the smaller of the two arguments. The result is unspecified if one of the arguments contains the float value [nan]. *) diff --git a/stdlib/printexc.ml b/stdlib/printexc.ml index 11e7d4fd6..63da48c56 100644 --- a/stdlib/printexc.ml +++ b/stdlib/printexc.ml @@ -86,7 +86,7 @@ type loc_info = * int (* end char *) | Unknown_location of bool (*is_raise*) -external get_exception_backtrace: +external get_exception_backtrace: unit -> loc_info array option = "caml_get_exception_backtrace" let format_loc_info pos li = |