summaryrefslogtreecommitdiffstats
path: root/byterun/memory.h
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2012-03-08 19:52:03 +0000
committerDamien Doligez <damien.doligez-inria.fr>2012-03-08 19:52:03 +0000
commit6c24f4f90b23e8c4536281d31461adfe5a15b739 (patch)
tree29f6c4af8052800cc7d0eafb9650c6be8e90a2e5 /byterun/memory.h
parent1fb4007ece64b1d59e16d7a84639fce1dd69ed45 (diff)
merge version 3.12 from 3.12.1 to r12205
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/memory.h')
-rw-r--r--byterun/memory.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/byterun/memory.h b/byterun/memory.h
index dddf9a36b..69f5ff91c 100644
--- a/byterun/memory.h
+++ b/byterun/memory.h
@@ -173,8 +173,8 @@ CAMLextern struct caml__roots_block *caml_local_roots; /* defined in roots.c */
If you need local variables of type [value], declare them with one
or more calls to the [CAMLlocal] macros at the beginning of the
- function. Use [CAMLlocalN] (at the beginning of the function) to
- declare an array of [value]s.
+ function, after the call to CAMLparam. Use [CAMLlocalN] (at the
+ beginning of the function) to declare an array of [value]s.
Your function may raise an exception or return a [value] with the
[CAMLreturn] macro. Its argument is simply the [value] returned by