From e6c7056ba6f1dca6d04e6d36515a0ffc3a5ec02a Mon Sep 17 00:00:00 2001
From: Stefan Seifert <nine@detonation.org>
Date: Wed, 30 Oct 2019 16:23:01 +0100
Subject: Move PL_check to the interp vars to fix threading issues

Fixes issue #14816
---
 opcode.h | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'opcode.h')

diff --git a/opcode.h b/opcode.h
index c4104dded1..63a9f9d9d7 100644
--- a/opcode.h
+++ b/opcode.h
@@ -1374,15 +1374,8 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 ;
 #endif
 
-#ifdef PERL_GLOBAL_STRUCT_INIT
-#  define PERL_CHECK_INITED
+#ifdef PERL_IN_PERL_C
 static const Perl_check_t Gcheck[]
-#elif !defined(PERL_GLOBAL_STRUCT)
-#  define PERL_CHECK_INITED
-EXT Perl_check_t PL_check[] /* or perlvars.h */
-#endif
-#if (defined(DOINIT) && !defined(PERL_GLOBAL_STRUCT)) || defined(PERL_GLOBAL_STRUCT_INIT)
-#  define PERL_CHECK_INITED
 = {
 	Perl_ck_null,		/* null */
 	Perl_ck_null,		/* stub */
@@ -1782,11 +1775,8 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	Perl_ck_null,		/* lvavref */
 	Perl_ck_null,		/* anonconst */
 	Perl_ck_isa,		/* isa */
-}
+};
 #endif
-#ifdef PERL_CHECK_INITED
-;
-#endif /* #ifdef PERL_CHECK_INITED */
 
 #ifndef PERL_GLOBAL_STRUCT_INIT
 
-- 
cgit v1.2.1