diff options
| author | Xavier Leroy <xavier.leroy@college-de-france.fr> | 2019-12-12 16:41:17 +0100 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2020-12-10 18:49:48 +0100 |
| commit | 4135828a4b66eb7403d68839da701257c0ccd31e (patch) | |
| tree | a532b723537e0424d3d3b1cbe548a1ae96bf48d3 | |
| parent | 49e63a406b9f410ccddc48c7aac1e21e25f26b32 (diff) | |
| download | ocaml-4135828a4b66eb7403d68839da701257c0ccd31e.tar.gz | |
Avoid duplicate definitions of "common" global variables
The variables are caml_debug_info and caml_atom_table.
The multiple definitions look like a cut-and-paste error.
They cause problems with C compilers that don't follow the "common" model.
Fixes: #9144
(cherry picked from commit 53327d777ddcacf829c77c0bd3569a8ade2c72b8)
| -rw-r--r-- | asmrun/startup.c | 1 | ||||
| -rw-r--r-- | byterun/backtrace.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/asmrun/startup.c b/asmrun/startup.c index 070f0c64f1..cf8a56f35e 100644 --- a/asmrun/startup.c +++ b/asmrun/startup.c @@ -44,7 +44,6 @@ #endif extern int caml_parser_trace; -CAMLexport header_t caml_atom_table[256]; char * caml_code_area_start, * caml_code_area_end; struct ext_table caml_code_fragments_table; diff --git a/byterun/backtrace.c b/byterun/backtrace.c index 8dfe9b7e38..436a40722b 100644 --- a/byterun/backtrace.c +++ b/byterun/backtrace.c @@ -27,9 +27,6 @@ #include "caml/backtrace_prim.h" #include "caml/fail.h" -/* The table of debug information fragments */ -struct ext_table caml_debug_info; - CAMLexport int32_t caml_backtrace_active = 0; CAMLexport int32_t caml_backtrace_pos = 0; CAMLexport backtrace_slot * caml_backtrace_buffer = NULL; |