Removed tripple definitions of CUSTOM_OP functions.

p4raw-id: //depot/perl@11761

6 files changed, 2 insertions, 96 deletions

diff --git a/embed.h b/embed.h
index bc39f88064..941c9b24cf 100644
--- a/embed.h
+++ b/embed.h
@@ -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
diff --git a/embed.pl b/embed.pl
index 88d11c2270..3788e2e8c1 100755
--- a/embed.pl
+++ b/embed.pl
@@ -2252,14 +2252,6 @@ Ap	|void	|sys_intern_init
 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:
diff --git a/global.sym b/global.sym
index 13c1968faf..ee9f7b8843 100644
--- a/global.sym
+++ b/global.sym
@@ -578,6 +578,8 @@ Perl_ptr_table_clear
 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
diff --git a/objXSUB.h b/objXSUB.h
index 50033c6b1c..d9d73b723b 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -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
diff --git a/perlapi.c b/perlapi.c
index e058f83553..64f9378236 100644
--- a/perlapi.c
+++ b/perlapi.c
@@ -4229,38 +4229,6 @@ 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_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
diff --git a/proto.h b/proto.h
index 7089f95962..e69c6f9b7f 100644
--- a/proto.h
+++ b/proto.h
@@ -988,14 +988,6 @@ PERL_CALLCONV void	Perl_sys_intern_init(pTHX);
 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: