This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
fix PERL_GLOBAL_STRUCT_PRIVATE builds
authorDavid Mitchell <davem@iabyn.com>
Fri, 20 Mar 2020 13:36:37 +0000 (13:36 +0000)
committerDavid Mitchell <davem@iabyn.com>
Fri, 20 Mar 2020 13:45:55 +0000 (13:45 +0000)
Sprinkle some dVAR pixie dust to fix recent bitrot on that build
configuration.

op.c
util.c

diff --git a/op.c b/op.c
index 0b8e961..75a38d3 100644 (file)
--- a/op.c
+++ b/op.c
@@ -5502,6 +5502,7 @@ Perl_invert(pTHX_ OP *o)
 OP *
 Perl_cmpchain_start(pTHX_ I32 type, OP *left, OP *right)
 {
 OP *
 Perl_cmpchain_start(pTHX_ I32 type, OP *left, OP *right)
 {
+    dVAR;
     BINOP *bop;
     OP *op;
 
     BINOP *bop;
     OP *op;
 
@@ -5527,6 +5528,7 @@ Perl_cmpchain_start(pTHX_ I32 type, OP *left, OP *right)
 OP *
 Perl_cmpchain_extend(pTHX_ I32 type, OP *ch, OP *right)
 {
 OP *
 Perl_cmpchain_extend(pTHX_ I32 type, OP *ch, OP *right)
 {
+    dVAR;
     BINOP *bop;
     OP *op;
 
     BINOP *bop;
     OP *op;
 
@@ -5566,6 +5568,8 @@ Perl_cmpchain_extend(pTHX_ I32 type, OP *ch, OP *right)
 OP *
 Perl_cmpchain_finish(pTHX_ OP *ch)
 {
 OP *
 Perl_cmpchain_finish(pTHX_ OP *ch)
 {
+    dVAR;
+
     PERL_ARGS_ASSERT_CMPCHAIN_FINISH;
     if (ch->op_type != OP_NULL) {
        OPCODE cmpoptype = ch->op_type;
     PERL_ARGS_ASSERT_CMPCHAIN_FINISH;
     if (ch->op_type != OP_NULL) {
        OPCODE cmpoptype = ch->op_type;
diff --git a/util.c b/util.c
index 3b91096..e95cb66 100644 (file)
--- a/util.c
+++ b/util.c
@@ -3632,6 +3632,7 @@ void
 Perl_init_tm(pTHX_ struct tm *ptm)     /* see mktime, strftime and asctime */
 {
 #ifdef HAS_TM_TM_ZONE
 Perl_init_tm(pTHX_ struct tm *ptm)     /* see mktime, strftime and asctime */
 {
 #ifdef HAS_TM_TM_ZONE
+    dVAR;
     Time_t now;
     const struct tm* my_tm;
     PERL_UNUSED_CONTEXT;
     Time_t now;
     const struct tm* my_tm;
     PERL_UNUSED_CONTEXT;