diff options
| author | Xavier Leroy <xavier.leroy@college-de-france.fr> | 2019-12-12 16:41:17 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2022-12-12 09:56:51 +0000 |
| commit | 5edfbe9ffbd60ddfe156ef658e6562081d260f55 (patch) | |
| tree | 1ce1c4516b3d6924e7996ac80f77543517f58a84 | |
| parent | bff9bdc50fd963d01b329dc6b76e625f9be92d78 (diff) | |
| download | ocaml-5edfbe9ffbd60ddfe156ef658e6562081d260f55.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 1375f60043..83790af723 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; /* Initialize the atom table and the static data and code area limits. */ diff --git a/byterun/backtrace.c b/byterun/backtrace.c index a5bc780951..c10c19f1fb 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; |