summaryrefslogtreecommitdiff
path: root/opcode.h
diff options
context:
space:
mode:
authorDagfinn Ilmari Mannsåker <ilmari@ilmari.org>2020-03-20 21:15:43 +0000
committerDagfinn Ilmari Mannsåker <ilmari@ilmari.org>2020-07-20 23:28:12 +0100
commit8c3a0f6ca6a8f3a02c3394507eb4284c1017dba1 (patch)
treeaaa777b26aeec48b155ff5b6465bdf8be109d7d4 /opcode.h
parent822c8b4dc3fe62cd97d78e693e5871fcc65782fd (diff)
downloadperl-8c3a0f6ca6a8f3a02c3394507eb4284c1017dba1.tar.gz
Remove PERL_GLOBAL_STRUCT
This was originally added for MinGW, which no longer needs it, and only still used by Symbian, which is now removed. This also leaves perlapi.[ch] empty, but we keep the header for CPAN backwards compatibility.
Diffstat (limited to 'opcode.h')
-rw-r--r--opcode.h39
1 files changed, 5 insertions, 34 deletions
diff --git a/opcode.h b/opcode.h
index 195898e4c3..c754a64015 100644
--- a/opcode.h
+++ b/opcode.h
@@ -13,8 +13,6 @@
* Any changes made here will be lost!
*/
-#ifndef PERL_GLOBAL_STRUCT_INIT
-
#define Perl_pp_scalar Perl_pp_null
#define Perl_pp_padany Perl_unimplemented_op
#define Perl_pp_regcmaybe Perl_pp_null
@@ -960,19 +958,10 @@ EXTCONST char* const PL_op_desc[] = {
END_EXTERN_C
-#endif /* !PERL_GLOBAL_STRUCT_INIT */
-
START_EXTERN_C
-#ifdef PERL_GLOBAL_STRUCT_INIT
-# define PERL_PPADDR_INITED
-static const Perl_ppaddr_t Gppaddr[]
-#elif !defined(PERL_GLOBAL_STRUCT)
-# define PERL_PPADDR_INITED
EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
-#endif /* PERL_GLOBAL_STRUCT */
-#if (defined(DOINIT) && !defined(PERL_GLOBAL_STRUCT)) || defined(PERL_GLOBAL_STRUCT_INIT)
-# define PERL_PPADDR_INITED
+#if defined(DOINIT)
= {
Perl_pp_null,
Perl_pp_stub,
@@ -1376,19 +1365,10 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
Perl_pp_cmpchain_dup,
}
#endif
-#ifdef PERL_PPADDR_INITED
;
-#endif
-#ifdef PERL_GLOBAL_STRUCT_INIT
-# define PERL_CHECK_INITED
-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
+#if defined(DOINIT)
= {
Perl_ck_null, /* null */
Perl_ck_null, /* stub */
@@ -1792,11 +1772,7 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
Perl_ck_null, /* cmpchain_dup */
}
#endif
-#ifdef PERL_CHECK_INITED
;
-#endif /* #ifdef PERL_CHECK_INITED */
-
-#ifndef PERL_GLOBAL_STRUCT_INIT
#ifndef DOINIT
EXTCONST U32 PL_opargs[];
@@ -2205,8 +2181,6 @@ EXTCONST U32 PL_opargs[] = {
};
#endif
-#endif /* !PERL_GLOBAL_STRUCT_INIT */
-
END_EXTERN_C
@@ -2322,9 +2296,7 @@ END_EXTERN_C
#define OPpTRANS_DELETE 0x80
START_EXTERN_C
-#ifndef PERL_GLOBAL_STRUCT_INIT
-
-# ifndef DOINIT
+#ifndef DOINIT
/* data about the flags in op_private */
@@ -2334,7 +2306,7 @@ EXTCONST char PL_op_private_labels[];
EXTCONST I16 PL_op_private_bitfields[];
EXTCONST U8 PL_op_private_valid[];
-# else
+#else
/* PL_op_private_labels[]: the short descriptions of private flags.
@@ -3372,8 +3344,7 @@ EXTCONST U8 PL_op_private_valid[] = {
};
-# endif /* !DOINIT */
-#endif /* !PERL_GLOBAL_STRUCT_INIT */
+#endif /* !DOINIT */
END_EXTERN_C