From 16c915390a3e066a7c2c13fac10d8dd8ebfea0c6 Mon Sep 17 00:00:00 2001 From: Ben Morrow Date: Sat, 14 Aug 2010 02:07:09 +0100 Subject: Remove CALL_FPTR and CPERLscope. These are left from PERL_OBJECT, which was an implementation of multiplicity using C++ objects. PERL_OBJECT was removed in 5.8, but the macros seem to have been cargo-culted all over the core (including in places where they would have been inappropriate originally). Since they now do exactly nothing, it's cleaner to remove them. I have left the definitions in perl.h, under #ifndef PERL_CORE, since some CPAN XS code uses them (also often incorrectly). I have also left STATIC alone, since it seems potentially more useful and is much more ingrained. The only appearance of these macros this patch doesn't touch is in Devel-PPPort, because that's a CPAN module. --- op.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'op.h') diff --git a/op.h b/op.h index 4241f02033..d537170289 100644 --- a/op.h +++ b/op.h @@ -54,7 +54,7 @@ typedef PERL_BITFIELD16 Optype; #define BASEOP \ OP* op_next; \ OP* op_sibling; \ - OP* (CPERLscope(*op_ppaddr))(pTHX); \ + OP* (*op_ppaddr)(pTHX); \ MADPROP_IN_BASEOP \ PADOFFSET op_targ; \ PERL_BITFIELD16 op_type:9; \ @@ -733,7 +733,7 @@ preprocessing token; the type of I depends on I. hk = INT2PTR(BHK *, SvIVX(sv)); \ \ if (BhkENTRY(hk, which)) \ - CALL_FPTR(BhkENTRY(hk, which))(aTHX_ arg); \ + BhkENTRY(hk, which)(aTHX_ arg); \ } \ } \ } STMT_END -- cgit v1.2.1