Change 18551 by jhi@kosh on 2003/01/22 12:28:11
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.
Affected files ...
... //depot/perl/embed.fnc#63 integrate
... //depot/perl/embed.h#377 integrate
... //depot/perl/ext/List/Util/Makefile.PL#6 integrate
... //depot/perl/global.sym#231 integrate
Differences ...
==== //depot/perl/embed.fnc#63 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#62~18531~ Mon Jan 20 17:52:49 2003
+++ perl/embed.fnc Wed Jan 22 04:28:11 2003
@@ -141,7 +141,7 @@
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
==== //depot/perl/embed.h#377 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#376~18531~ Mon Jan 20 17:52:49 2003
+++ perl/embed.h Wed Jan 22 04:28:11 2003
@@ -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)
==== //depot/perl/ext/List/Util/Makefile.PL#6 (text) ====
Index: perl/ext/List/Util/Makefile.PL
--- perl/ext/List/Util/Makefile.PL#5~13432~ Sun Dec 2 14:35:04 2001
+++ perl/ext/List/Util/Makefile.PL Wed Jan 22 04:28:11 2003
@@ -2,8 +2,9 @@
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;
==== //depot/perl/global.sym#231 (text+w) ====
Index: perl/global.sym
--- perl/global.sym#230~18531~ Mon Jan 20 17:52:49 2003
+++ perl/global.sym Wed Jan 22 04:28:11 2003
@@ -79,7 +79,6 @@
Perl_get_op_descs
Perl_get_op_names
Perl_get_ppaddr
-Perl_cxinc
Perl_deb
Perl_vdeb
Perl_debprofdump
End of Patch.
