Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multiple definitions of a global variable when using the C interface with a C++ compiler (#9176) 

The `CAML_STATIC_ASSERT` declares a global variable which was neither `static` nor `extern`.  Multiple uses of the macro cause multiple variables with the same name, which are accepted under the "common" C model but are rejected in C++ and in some C compilers that don't use the "common" model.  The fix is to declare the variable `extern`.
master
Kate 2019-12-12 15:18:44 +00:00 committed by Xavier Leroy
parent 718ace537e
commit 289521b977
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/caml/misc.h
View File

@ -145,7 +145,7 @@ extern caml_timing_hook caml_finalise_begin_hook, caml_finalise_end_hook;
#define CAML_STATIC_ASSERT_3(b, l) \
CAMLunused_start \
char static_assertion_failure_line_##l[(b) ? 1 : -1] \
CAMLextern char static_assertion_failure_line_##l[(b) ? 1 : -1] \
CAMLunused_end
#define CAML_STATIC_ASSERT_2(b, l) CAML_STATIC_ASSERT_3(b, l)