From 72aba64fff09a829bfaf41165d0075066f087185 Mon Sep 17 00:00:00 2001
From: Matt Valentine-House <matt@eightbitraptor.com>
Date: Wed, 8 Feb 2023 11:56:53 +0000
Subject: Merge gc.h and internal/gc.h

[Feature #19425]
---
 ext/objspace/depend           | 7 ++++---
 ext/objspace/object_tracing.c | 2 +-
 ext/objspace/objspace.c       | 2 +-
 ext/objspace/objspace_dump.c  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'ext/objspace')

diff --git a/ext/objspace/depend b/ext/objspace/depend
index 23b5430f32..d9c0a8a050 100644
--- a/ext/objspace/depend
+++ b/ext/objspace/depend
@@ -6,6 +6,7 @@ object_tracing.o: $(hdrdir)/ruby/backward.h
 object_tracing.o: $(hdrdir)/ruby/backward/2/assume.h
 object_tracing.o: $(hdrdir)/ruby/backward/2/attributes.h
 object_tracing.o: $(hdrdir)/ruby/backward/2/bool.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
 object_tracing.o: $(hdrdir)/ruby/backward/2/inttypes.h
 object_tracing.o: $(hdrdir)/ruby/backward/2/limits.h
 object_tracing.o: $(hdrdir)/ruby/backward/2/long_long.h
@@ -159,8 +160,10 @@ object_tracing.o: $(hdrdir)/ruby/missing.h
 object_tracing.o: $(hdrdir)/ruby/ruby.h
 object_tracing.o: $(hdrdir)/ruby/st.h
 object_tracing.o: $(hdrdir)/ruby/subst.h
-object_tracing.o: $(top_srcdir)/gc.h
 object_tracing.o: $(top_srcdir)/internal.h
+object_tracing.o: $(top_srcdir)/internal/compilers.h
+object_tracing.o: $(top_srcdir)/internal/gc.h
+object_tracing.o: $(top_srcdir)/internal/warnings.h
 object_tracing.o: object_tracing.c
 object_tracing.o: objspace.h
 objspace.o: $(RUBY_EXTCONF_H)
@@ -339,7 +342,6 @@ objspace.o: $(hdrdir)/ruby/regex.h
 objspace.o: $(hdrdir)/ruby/ruby.h
 objspace.o: $(hdrdir)/ruby/st.h
 objspace.o: $(hdrdir)/ruby/subst.h
-objspace.o: $(top_srcdir)/gc.h
 objspace.o: $(top_srcdir)/id_table.h
 objspace.o: $(top_srcdir)/internal.h
 objspace.o: $(top_srcdir)/internal/array.h
@@ -539,7 +541,6 @@ objspace_dump.o: $(top_srcdir)/ccan/container_of/container_of.h
 objspace_dump.o: $(top_srcdir)/ccan/list/list.h
 objspace_dump.o: $(top_srcdir)/ccan/str/str.h
 objspace_dump.o: $(top_srcdir)/constant.h
-objspace_dump.o: $(top_srcdir)/gc.h
 objspace_dump.o: $(top_srcdir)/id_table.h
 objspace_dump.o: $(top_srcdir)/internal.h
 objspace_dump.o: $(top_srcdir)/internal/array.h
diff --git a/ext/objspace/object_tracing.c b/ext/objspace/object_tracing.c
index 8c54d51eab..c1c93c51f5 100644
--- a/ext/objspace/object_tracing.c
+++ b/ext/objspace/object_tracing.c
@@ -13,8 +13,8 @@
 
 **********************************************************************/
 
-#include "gc.h"
 #include "internal.h"
+#include "internal/gc.h"
 #include "ruby/debug.h"
 #include "objspace.h"
 
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 31099b8849..e8762d1be6 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -12,10 +12,10 @@
 
 **********************************************************************/
 
-#include "gc.h"
 #include "internal.h"
 #include "internal/class.h"
 #include "internal/compilers.h"
+#include "internal/gc.h"
 #include "internal/hash.h"
 #include "internal/imemo.h"
 #include "internal/sanitizers.h"
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index f101b334c1..d8a11083d6 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -12,11 +12,11 @@
 
 **********************************************************************/
 
-#include "gc.h"
 #include "id_table.h"
 #include "internal.h"
 #include "internal/array.h"
 #include "internal/class.h"
+#include "internal/gc.h"
 #include "internal/hash.h"
 #include "internal/string.h"
 #include "internal/sanitizers.h"
-- 
cgit v1.2.3