diff options
| author | KC Sivaramakrishnan <kc@kcsrk.info> | 2018-03-12 15:50:56 +0000 |
|---|---|---|
| committer | KC Sivaramakrishnan <kc@kcsrk.info> | 2018-03-12 15:50:56 +0000 |
| commit | 4b8d95140e1d7eed6ac9f1416b8ed92718e88921 (patch) | |
| tree | 3e512b10fadf75564461cac300f4c1c376da19a7 /stdlib/gc.ml | |
| parent | adef404d99242f953460d4fac11b008b859d6478 (diff) | |
| parent | 0c0884bd87a99d08a6185355fe6754ff13a29dc1 (diff) | |
| download | ocaml-4b8d95140e1d7eed6ac9f1416b8ed92718e88921.tar.gz | |
Merge updates from 4.04.2
Diffstat (limited to 'stdlib/gc.ml')
| -rw-r--r-- | stdlib/gc.ml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stdlib/gc.ml b/stdlib/gc.ml index 307a60192f..1bfbd21f55 100644 --- a/stdlib/gc.ml +++ b/stdlib/gc.ml @@ -1,12 +1,12 @@ (**************************************************************************) -(* *) -(* OCaml *) -(* *) -(* Damien Doligez, projet Para, INRIA Rocquencourt *) -(* *) -(* Copyright 1996 Institut National de Recherche en Informatique et *) +(* *) +(* OCaml *) +(* *) +(* Damien Doligez, projet Para, INRIA Rocquencourt *) +(* *) +(* Copyright 1996 Institut National de Recherche en Informatique et *) (* en Automatique. *) -(* *) +(* *) (* All rights reserved. This file is distributed under the terms of *) (* the GNU Lesser General Public License version 2.1, with the *) (* special exception on linking described in the file LICENSE. *) @@ -90,13 +90,13 @@ let allocated_bytes () = let (mi, pro, ma) = counters () in (mi +. ma -. pro) *. float_of_int (Sys.word_size / 8) - -external promote_to : 'a -> 'b -> 'a = "caml_obj_promote_to" external finalise : ('a -> unit) -> 'a -> unit = "caml_final_register" external finalise_last : (unit -> unit) -> 'a -> unit = "caml_final_register_called_without_value" external finalise_release : unit -> unit = "caml_final_release" +external promote_to : 'a -> 'b -> 'a = "caml_obj_promote_to" + type alarm = bool ref type alarm_rec = {active : alarm; f : unit -> unit} |