Move RUBY_TYPED_FROZEN_SHAREABLE macro to json.h

etiennebarrie · etiennebarrie · commit 1219ce0f45c9 · 2025-11-21T16:57:59.000+01:00
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
@@ -926,11 +926,6 @@ static size_t State_memsize(const void *ptr)
     return sizeof(JSON_Generator_State);
 }
 
-#ifndef HAVE_RB_EXT_RACTOR_SAFE
-#   undef RUBY_TYPED_FROZEN_SHAREABLE
-#   define RUBY_TYPED_FROZEN_SHAREABLE 0
-#endif
-
 static const rb_data_type_t JSON_Generator_State_type = {
     "JSON/Generator/State",
     {
diff --git a/ext/json/ext/json.h b/ext/json/ext/json.h
@@ -45,6 +45,11 @@ typedef unsigned char _Bool;
 #endif
 #endif
 
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+#   undef RUBY_TYPED_FROZEN_SHAREABLE
+#   define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 #ifndef NORETURN
 #define NORETURN(x) x
 #endif
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
@@ -1555,11 +1555,6 @@ static size_t JSON_ParserConfig_memsize(const void *ptr)
     return sizeof(JSON_ParserConfig);
 }
 
-#ifndef HAVE_RB_EXT_RACTOR_SAFE
-#   undef RUBY_TYPED_FROZEN_SHAREABLE
-#   define RUBY_TYPED_FROZEN_SHAREABLE 0
-#endif
-
 static const rb_data_type_t JSON_ParserConfig_type = {
     "JSON::Ext::Parser/ParserConfig",
     {

Original file line number	Diff line number	Diff line change
`@@ -926,11 +926,6 @@ static size_t State_memsize(const void *ptr)`
`926`	`926`	`return sizeof(JSON_Generator_State);`
`927`	`927`	`}`
`928`	`928`
`929`		`-#ifndef HAVE_RB_EXT_RACTOR_SAFE`
`930`		`-# undef RUBY_TYPED_FROZEN_SHAREABLE`
`931`		`-# define RUBY_TYPED_FROZEN_SHAREABLE 0`
`932`		`-#endif`
`933`		`-`
`934`	`929`	`static const rb_data_type_t JSON_Generator_State_type = {`
`935`	`930`	`"JSON/Generator/State",`
`936`	`931`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1555,11 +1555,6 @@ static size_t JSON_ParserConfig_memsize(const void *ptr)`
`1555`	`1555`	`return sizeof(JSON_ParserConfig);`
`1556`	`1556`	`}`
`1557`	`1557`
`1558`		`-#ifndef HAVE_RB_EXT_RACTOR_SAFE`
`1559`		`-# undef RUBY_TYPED_FROZEN_SHAREABLE`
`1560`		`-# define RUBY_TYPED_FROZEN_SHAREABLE 0`
`1561`		`-#endif`
`1562`		`-`
`1563`	`1558`	`static const rb_data_type_t JSON_ParserConfig_type = {`
`1564`	`1559`	`"JSON::Ext::Parser/ParserConfig",`
`1565`	`1560`	`{`