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

More compatibility macros to Caml_state (#9202) 

runtime/caml/compatibility.h:
Add compatibility macros for globals that have been moved to Caml_state.
Some of these globals are used by 3rd-party libraries, e.g. delimcc

.gitattributes:
Tolerate long lines in runtime/caml/compatibility.h.
It's better to keep the "one #define per line" style than to introduce
line breaks there.

(cherry picked from commit 073fcbb14ab8c66009beb6ef49c240a24766feac)
master
Kate 2019-12-26 09:49:30 +01:00 committed by Xavier Leroy
parent 4e6e912328
commit dc458a0436
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -168,6 +168,7 @@ tools/pre-commit-githook text eol=lf
tools/markdown-add-pr-links.sh text eol=lf
runtime/caml/m.h.in text eol=lf
runtime/caml/s.h.in text eol=lf
runtime/caml/compatibility.h typo.long-line=may
# These are all Perl scripts, so may not actually require this
manual/tools/caml-tex text eol=lf

22
runtime/caml/compatibility.h
View File

@ -29,6 +29,13 @@
#define caml_young_end (Caml_state_field(young_end))
#define caml_young_ptr (Caml_state_field(young_ptr))
#define caml_young_limit (Caml_state_field(young_limit))
#define caml_young_alloc_start (Caml_state_field(young_alloc_start))
#define caml_young_alloc_end (Caml_state_field(young_alloc_end))
#define caml_young_alloc_mid (Caml_state_field(young_alloc_mid))
#define caml_young_trigger (Caml_state_field(young_trigger))
#define caml_minor_heap_wsz (Caml_state_field(minor_heap_wsz))
#define caml_in_minor_collection (Caml_state_field(in_minor_collection))
#define caml_extra_heap_resources_minor (Caml_state_field(extra_heap_resources_minor))
#define caml_local_roots (Caml_state_field(local_roots))
#define caml_backtrace_active (Caml_state_field(backtrace_active))
#define caml_backtrace_pos (Caml_state_field(backtrace_pos))
@ -42,6 +49,21 @@
#define caml_extern_sp (Caml_state_field(extern_sp))
#define caml_trapsp (Caml_state_field(trapsp))
#define caml_trap_barrier (Caml_state_field(trap_barrier))
#define caml_exception_pointer (Caml_state_field(exception_pointer))
#define caml_exn_bucket (Caml_state_field(exn_bucket))
#define caml_top_of_stack (Caml_state_field(top_of_stack))
#define caml_bottom_of_stack (Caml_state_field(bottom_of_stack))
#define caml_last_return_address (Caml_state_field(last_return_address))
#define caml_gc_regs (Caml_state_field(gc_regs))
#define caml_requested_major_slice (Caml_state_field(requested_major_slice))
#define caml_requested_minor_gc (Caml_state_field(requested_minor_gc))
#define caml_stat_minor_words (Caml_state_field(stat_minor_words))
#define caml_stat_promoted_words (Caml_state_field(stat_promoted_words))
#define caml_stat_major_words (Caml_state_field(stat_major_words))
#define caml_stat_minor_collections (Caml_state_field(stat_minor_collections))
#define caml_stat_major_collections (Caml_state_field(stat_major_collections))
#define caml_stat_compactions (Caml_state_field(stat_compactions))
#define caml_stat_heap_chunks (Caml_state_field(stat_heap_chunks))
#ifndef CAML_NAME_SPACE