Change 11761 by sky@sky-borderline on 2001/08/27 18:34:48
Removed tripple definitions of CUSTOM_OP functions.
Affected files ...
... //depot/perl/embed.h#281 edit
... //depot/perl/embed.pl#267 edit
... //depot/perl/global.sym#175 edit
... //depot/perl/objXSUB.h#180 edit
... //depot/perl/perlapi.c#122 edit
... //depot/perl/proto.h#326 edit
Differences ...
==== //depot/perl/embed.h#281 (text+w) ====
Index: perl/embed.h
--- perl/embed.h.~1~ Mon Aug 27 12:45:05 2001
+++ perl/embed.h Mon Aug 27 12:45:05 2001
@@ -877,14 +877,6 @@
#define custom_op_name Perl_custom_op_name
#define custom_op_desc Perl_custom_op_desc
#endif
-#if defined(PERL_CUSTOM_OPS)
-#define custom_op_name Perl_custom_op_name
-#define custom_op_desc Perl_custom_op_desc
-#endif
-#if defined(PERL_CUSTOM_OPS)
-#define custom_op_name Perl_custom_op_name
-#define custom_op_desc Perl_custom_op_desc
-#endif
#if defined(PERL_OBJECT)
#else
#endif
@@ -2404,14 +2396,6 @@
#define custom_op_name(a) Perl_custom_op_name(aTHX_ a)
#define custom_op_desc(a) Perl_custom_op_desc(aTHX_ a)
#endif
-#if defined(PERL_CUSTOM_OPS)
-#define custom_op_name(a) Perl_custom_op_name(aTHX_ a)
-#define custom_op_desc(a) Perl_custom_op_desc(aTHX_ a)
-#endif
-#if defined(PERL_CUSTOM_OPS)
-#define custom_op_name(a) Perl_custom_op_name(aTHX_ a)
-#define custom_op_desc(a) Perl_custom_op_desc(aTHX_ a)
-#endif
#if defined(PERL_OBJECT)
#else
#endif
@@ -4727,18 +4711,6 @@
#define Perl_custom_op_desc CPerlObj::Perl_custom_op_desc
#define custom_op_desc Perl_custom_op_desc
#endif
-#if defined(PERL_CUSTOM_OPS)
-#define Perl_custom_op_name CPerlObj::Perl_custom_op_name
-#define custom_op_name Perl_custom_op_name
-#define Perl_custom_op_desc CPerlObj::Perl_custom_op_desc
-#define custom_op_desc Perl_custom_op_desc
-#endif
-#if defined(PERL_CUSTOM_OPS)
-#define Perl_custom_op_name CPerlObj::Perl_custom_op_name
-#define custom_op_name Perl_custom_op_name
-#define Perl_custom_op_desc CPerlObj::Perl_custom_op_desc
-#define custom_op_desc Perl_custom_op_desc
-#endif
#if defined(PERL_OBJECT)
#else
#endif
==== //depot/perl/embed.pl#267 (xtext) ====
Index: perl/embed.pl
--- perl/embed.pl.~1~ Mon Aug 27 12:45:05 2001
+++ perl/embed.pl Mon Aug 27 12:45:05 2001
@@ -2252,14 +2252,6 @@
Ap |char * |custom_op_name|OP* op
Ap |char * |custom_op_desc|OP* op
#endif
-#if defined(PERL_CUSTOM_OPS)
-Ap |char * |custom_op_name|OP* op
-Ap |char * |custom_op_desc|OP* op
-#endif
-#if defined(PERL_CUSTOM_OPS)
-Ap |char * |custom_op_name|OP* op
-Ap |char * |custom_op_desc|OP* op
-#endif
#if defined(PERL_OBJECT)
protected:
==== //depot/perl/global.sym#175 (text+w) ====
Index: perl/global.sym
--- perl/global.sym.~1~ Mon Aug 27 12:45:05 2001
+++ perl/global.sym Mon Aug 27 12:45:05 2001
@@ -578,6 +578,8 @@
Perl_ptr_table_free
Perl_sys_intern_clear
Perl_sys_intern_init
+Perl_custom_op_name
+Perl_custom_op_desc
Perl_sharedsv_init
Perl_sharedsv_new
Perl_sharedsv_find
==== //depot/perl/objXSUB.h#180 (text+w) ====
Index: perl/objXSUB.h
--- perl/objXSUB.h.~1~ Mon Aug 27 12:45:05 2001
+++ perl/objXSUB.h Mon Aug 27 12:45:05 2001
@@ -2349,26 +2349,6 @@
#undef custom_op_desc
#define custom_op_desc Perl_custom_op_desc
#endif
-#if defined(PERL_CUSTOM_OPS)
-#undef Perl_custom_op_name
-#define Perl_custom_op_name pPerl->Perl_custom_op_name
-#undef custom_op_name
-#define custom_op_name Perl_custom_op_name
-#undef Perl_custom_op_desc
-#define Perl_custom_op_desc pPerl->Perl_custom_op_desc
-#undef custom_op_desc
-#define custom_op_desc Perl_custom_op_desc
-#endif
-#if defined(PERL_CUSTOM_OPS)
-#undef Perl_custom_op_name
-#define Perl_custom_op_name pPerl->Perl_custom_op_name
-#undef custom_op_name
-#define custom_op_name Perl_custom_op_name
-#undef Perl_custom_op_desc
-#define Perl_custom_op_desc pPerl->Perl_custom_op_desc
-#undef custom_op_desc
-#define custom_op_desc Perl_custom_op_desc
-#endif
#if defined(PERL_OBJECT)
#else
#endif
==== //depot/perl/perlapi.c#122 (text+w) ====
Index: perl/perlapi.c
--- perl/perlapi.c.~1~ Mon Aug 27 12:45:05 2001
+++ perl/perlapi.c Mon Aug 27 12:45:05 2001
@@ -4229,38 +4229,6 @@
return ((CPerlObj*)pPerl)->Perl_custom_op_desc(op);
}
#endif
-#if defined(PERL_CUSTOM_OPS)
-
-#undef Perl_custom_op_name
-char *
-Perl_custom_op_name(pTHXo_ OP* op)
-{
- return ((CPerlObj*)pPerl)->Perl_custom_op_name(op);
-}
-
-#undef Perl_custom_op_desc
-char *
-Perl_custom_op_desc(pTHXo_ OP* op)
-{
- return ((CPerlObj*)pPerl)->Perl_custom_op_desc(op);
-}
-#endif
-#if defined(PERL_CUSTOM_OPS)
-
-#undef Perl_custom_op_name
-char *
-Perl_custom_op_name(pTHXo_ OP* op)
-{
- return ((CPerlObj*)pPerl)->Perl_custom_op_name(op);
-}
-
-#undef Perl_custom_op_desc
-char *
-Perl_custom_op_desc(pTHXo_ OP* op)
-{
- return ((CPerlObj*)pPerl)->Perl_custom_op_desc(op);
-}
-#endif
#if defined(PERL_OBJECT)
#else
#endif
==== //depot/perl/proto.h#326 (text+w) ====
Index: perl/proto.h
--- perl/proto.h.~1~ Mon Aug 27 12:45:05 2001
+++ perl/proto.h Mon Aug 27 12:45:05 2001
@@ -988,14 +988,6 @@
PERL_CALLCONV char * Perl_custom_op_name(pTHX_ OP* op);
PERL_CALLCONV char * Perl_custom_op_desc(pTHX_ OP* op);
#endif
-#if defined(PERL_CUSTOM_OPS)
-PERL_CALLCONV char * Perl_custom_op_name(pTHX_ OP* op);
-PERL_CALLCONV char * Perl_custom_op_desc(pTHX_ OP* op);
-#endif
-#if defined(PERL_CUSTOM_OPS)
-PERL_CALLCONV char * Perl_custom_op_name(pTHX_ OP* op);
-PERL_CALLCONV char * Perl_custom_op_desc(pTHX_ OP* op);
-#endif
#if defined(PERL_OBJECT)
protected:
End of Patch.
