Integrate from maint-5.8:

[ 18375]
Better version of change #18370; use the new 'E' flag
so that cxinc is exposed (as cpp) only to List::Util
(well, any extension) (well, anyone who does -DPERL_EXT),
no need to export it globally.
p4raw-link: @18375 on //depot/maint-5.8/perl: c8ec9884b4dd9ffdd0a7d1514952a74c55bfab3e
p4raw-link: @18370 on //depot/maint-5.8/perl: 94115b5677e78fbc3321ad88fedfaa3b6bc804bf

p4raw-id: //depot/perl@18551
p4raw-integrated: from //depot/maint-5.8/perl@18545 'copy in'
	ext/List/Util/Makefile.PL (@17645..) 'merge in' embed.fnc
	embed.h global.sym (@18370..)

diff --git a/embed.fnc b/embed.fnc
index 4394eba..a2009db 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -141,7 +141,7 @@ Ap  |char** |get_op_names
 p      |char*  |get_no_modify
 p      |U32*   |get_opargs
 Ap     |PPADDR_t*|get_ppaddr
-Ap     |I32    |cxinc
+Ep     |I32    |cxinc
 Afp    |void   |deb            |const char* pat|...
 Ap     |void   |vdeb           |const char* pat|va_list* args
 Ap     |void   |debprofdump

diff --git a/embed.h b/embed.h
index 2325d12..c3de3cf 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -141,7 +141,9 @@
 #define get_opargs             Perl_get_opargs
 #endif
 #define get_ppaddr             Perl_get_ppaddr
+#if defined(PERL_CORE) || defined(PERL_EXT)
 #define cxinc                  Perl_cxinc
+#endif
 #define deb                    Perl_deb
 #define vdeb                   Perl_vdeb
 #define debprofdump            Perl_debprofdump
@@ -2596,7 +2598,9 @@
 #define get_opargs()           Perl_get_opargs(aTHX)
 #endif
 #define get_ppaddr()           Perl_get_ppaddr(aTHX)
+#if defined(PERL_CORE) || defined(PERL_EXT)
 #define cxinc()                        Perl_cxinc(aTHX)
+#endif
 #define vdeb(a,b)              Perl_vdeb(aTHX_ a,b)
 #define debprofdump()          Perl_debprofdump(aTHX)
 #define debop(a)               Perl_debop(aTHX_ a)

diff --git a/ext/List/Util/Makefile.PL b/ext/List/Util/Makefile.PL
index eed19f9..48dccdb 100644 (file)
--- a/ext/List/Util/Makefile.PL
+++ b/ext/List/Util/Makefile.PL
@@ -2,8 +2,9 @@ use ExtUtils::MakeMaker;
 
 WriteMakefile(
     VERSION_FROM    => "lib/List/Util.pm",
-    MAN3PODS    => {},  # Pods will be built by installman.
+    MAN3PODS        => {},  # Pods will be built by installman.
     NAME            => "List::Util",
+    DEFINE          => "-DPERL_EXT",
 );
 
 package MY;

diff --git a/global.sym b/global.sym
index a4ad684..9e3ddcd 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -79,7 +79,6 @@ Perl_filter_read
 Perl_get_op_descs
 Perl_get_op_names
 Perl_get_ppaddr
-Perl_cxinc
 Perl_deb
 Perl_vdeb
 Perl_debprofdump