https://git.ruby-lang.org/ruby.git/commit/?id=7069f64c41

From 7069f64c419ebb9a7fd3e48d81454148ed4b2fba Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 16 May 2019 15:43:16 +0900
Subject: Prefix global_symbols with `ruby_`


diff --git a/.gdbinit b/.gdbinit
index 1c7d58f..0d44622 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1073,9 +1073,9 @@ define print_id https://github.com/ruby/ruby/blob/trunk/.gdbinit#L1073
   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
diff --git a/gc.c b/gc.c
index f7e8f2b..af44914 100644
--- a/gc.c
+++ b/gc.c
@@ -8080,7 +8080,8 @@ gc_ref_update(void *vstart, void *vend, size_t stride, void * data) https://github.com/ruby/ruby/blob/trunk/gc.c#L8080
     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)
diff --git a/symbol.c b/symbol.c
index b7df410..78681ec 100644
--- a/symbol.c
+++ b/symbol.c
@@ -63,7 +63,8 @@ enum id_entry_type { https://github.com/ruby/ruby/blob/trunk/symbol.c#L63
     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,
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/