Move FEATURE_IS_ENABLED to feature.h

It makes little sense to have it in perl.h any more.  (Until
recently, feature.h didn’t exist.)

3 files changed, 16 insertions, 11 deletions

diff --git a/feature.h b/feature.h
index 31547fbcff..1cbd0478e5 100644
--- a/feature.h
+++ b/feature.h
@@ -19,6 +19,13 @@
     (PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints)
 #define CURRENT_FEATURE_BUNDLE	(CURRENT_HINTS >> HINT_FEATURE_SHIFT)
 
+#define FEATURE_IS_ENABLED(name)				        \
+	(((PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) \
+	   & HINT_LOCALIZE_HH)						  \
+	    && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name)))
+/* The longest string we pass in.  */
+#define MAX_FEATURE_LEN (sizeof("unicode_strings")-1)
+
 #define FEATURE_SAY_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
diff --git a/perl.h b/perl.h
index 4dcd259dc4..184d4b55b4 100644
--- a/perl.h
+++ b/perl.h
@@ -5747,15 +5747,6 @@ extern void moncontrol(int);
 #define PERL_PV_PRETTY_DUMP  PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_QUOTE
 #define PERL_PV_PRETTY_REGPROP PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_LTGT|PERL_PV_ESCAPE_RE|PERL_PV_ESCAPE_NONASCII
 
-#if defined(PERL_CORE) || defined(PERL_EXT)
-#  define FEATURE_IS_ENABLED(name)				        \
-	(((PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) \
-	   & HINT_LOCALIZE_HH)						\
-	    && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name)))
-/* The longest string we pass in.  */
-#  define MAX_FEATURE_LEN (sizeof("unicode_strings")-1)
-#endif
-
 /*
 
    (KEEP THIS LAST IN perl.h!)
diff --git a/regen/feature.pl b/regen/feature.pl
index ab60389edd..32d7123187 100755
--- a/regen/feature.pl
+++ b/regen/feature.pl
@@ -209,13 +209,20 @@ for (@HintedBundles) {
     print $h "#define FEATURE_BUNDLE_$key	", $count++, "\n";
 }
 
-print $h <<EOH;
+print $h <<'EOH';
 #define FEATURE_BUNDLE_CUSTOM	(HINT_FEATURE_MASK >> HINT_FEATURE_SHIFT)
 
-#define CURRENT_HINTS \\
+#define CURRENT_HINTS \
     (PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints)
 #define CURRENT_FEATURE_BUNDLE	(CURRENT_HINTS >> HINT_FEATURE_SHIFT)
 
+#define FEATURE_IS_ENABLED(name)				        \
+	(((PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) \
+	   & HINT_LOCALIZE_HH)						  \
+	    && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name)))
+/* The longest string we pass in.  */
+#define MAX_FEATURE_LEN (sizeof("unicode_strings")-1)
+
 EOH
 
 for (