Avoid multiple declarations in generated .c files in -output-obj
authorStephane Glondu <steph@glondu.net>
Thu, 21 Apr 2011 16:39:31 +0000 (18:39 +0200)
committerRalf Treinen <treinen@debian.org>
Fri, 15 Jul 2016 20:19:44 +0000 (20:19 +0000)
commitc9a3d25d37363b1057da4384f17d145eec9674b0
tree1e737913c3dfd3e06e97694031fc096402ebdda0
parent30b2ec969f241c405a52c9f574a88a58d1d256a8
Avoid multiple declarations in generated .c files in -output-obj

In -output-obj mode, <caml/mlvalues.h> (which contains some
primitives) is included in the generated .c file, leading to errors
when compiling with g++ (multiple declarations).

There are probably better implementations (in particular, in this one,
care must be taken when changing the list of primitives available in
mlvalues.h), but this is a small and (not too) intrusive patch.

Bug: http://caml.inria.fr/mantis/view.php?id=5254
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
bytecomp/bytelink.ml
bytecomp/symtable.ml
bytecomp/symtable.mli