diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-05-16 15:43:16 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-05-16 15:43:16 +0900 |
commit | 7069f64c419ebb9a7fd3e48d81454148ed4b2fba (patch) | |
tree | 33b3f8299d21cd819326113f3fad33d2db90ed9e | |
parent | 973431c059ab2719e97d1ec051d21aa63a43a005 (diff) |
Prefix global_symbols with `ruby_`
-rw-r--r-- | .gdbinit | 4 | ||||
-rw-r--r-- | gc.c | 3 | ||||
-rw-r--r-- | symbol.c | 3 |
3 files changed, 6 insertions, 4 deletions
@@ -1073,9 +1073,9 @@ define print_id else set $serial = (rb_id_serial_t)$id end - if $serial && $serial <= global_symbols.last_id + if $serial && $serial <= ruby_global_symbols.last_id set $idx = $serial / ID_ENTRY_UNIT - set $ids = (struct RArray *)global_symbols.ids + set $ids = (struct RArray *)ruby_global_symbols.ids set $flags = $ids->basic.flags if ($flags & RUBY_FL_USER1) set $idsptr = $ids->as.ary @@ -8080,7 +8080,8 @@ gc_ref_update(void *vstart, void *vend, size_t stride, void * data) return 0; } -extern rb_symbols_t global_symbols; +extern rb_symbols_t ruby_global_symbols; +#define global_symbols ruby_global_symbols static void gc_update_references(rb_objspace_t * objspace) @@ -63,7 +63,8 @@ enum id_entry_type { ID_ENTRY_SIZE }; -rb_symbols_t global_symbols = {tNEXT_ID-1}; +rb_symbols_t ruby_global_symbols = {tNEXT_ID-1}; +#define global_symbols ruby_global_symbols static const struct st_hash_type symhash = { rb_str_hash_cmp, |