Remove the conditional #define of OPpPAD_STATE from the BOOT block in B.xs

This can now be done with less code in the Makefile.PL since commit
b1826b71659a2c08 changed B to use ExtUtils::Constant

diff --git a/ext/B/B.xs b/ext/B/B.xs
index 872d399..16c6179 100644 (file)
--- a/ext/B/B.xs
+++ b/ext/B/B.xs
@@ -605,9 +605,6 @@ BOOT:
     specialsv_list[4] = (SV *) pWARN_ALL;
     specialsv_list[5] = (SV *) pWARN_NONE;
     specialsv_list[6] = (SV *) pWARN_STD;
-#if PERL_VERSION <= 8
-#  define OPpPAD_STATE 0
-#endif
 }
 
 #define B_main_cv()    PL_main_cv

diff --git a/ext/B/Makefile.PL b/ext/B/Makefile.PL
index d026a71..f3d59ac 100644 (file)
--- a/ext/B/Makefile.PL
+++ b/ext/B/Makefile.PL
@@ -36,7 +36,7 @@ if ($] >= 5.009) {
     push @names, 'AVf_REAL';
     # This is only present in 5.10, but it's useful to B::Deparse to be able
     # to import a dummy value from B
-    push @names, 'OPpPAD_STATE';
+    push @names, {name=>"OPpPAD_STATE", default=>["IV", "0"]};
 }  
 
 if ($] < 5.011) {
@@ -71,6 +71,6 @@ foreach my $tuple (['op_reg_common.h','(?:(?:RXf_)?PMf_)'],
 WriteConstants(
     PROXYSUBS => {push => 'EXPORT_OK'},
     NAME => 'B',
-    NAMES => [map {{name=>$_, macro=>1}} @names],
+    NAMES => [map {ref $_ ? $_ : {name=>$_, macro=>1}} @names],
     XS_SUBNAME => undef,
 );