diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
commit | 7844495624be79259e613182e6a615319b2f4376 (patch) | |
tree | 8656b9339174ab9061b42be2b50c2d9563401c8a /otherlibs/systhreads/st_stubs.c | |
parent | e9723139769a4df610fadba0fdeecab298c1c17e (diff) | |
download | ocaml-7844495624be79259e613182e6a615319b2f4376.tar.gz |
Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/systhreads/st_stubs.c')
-rw-r--r-- | otherlibs/systhreads/st_stubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/otherlibs/systhreads/st_stubs.c b/otherlibs/systhreads/st_stubs.c index 02d4c54fc4..dd99c7369a 100644 --- a/otherlibs/systhreads/st_stubs.c +++ b/otherlibs/systhreads/st_stubs.c @@ -823,7 +823,7 @@ CAMLprim value caml_condition_signal(value wrapper) /* ML */ CAMLprim value caml_condition_broadcast(value wrapper) /* ML */ { st_check_error(st_condvar_broadcast(Condition_val(wrapper)), - "Condition.signal"); + "Condition.broadcast"); return Val_unit; } |