summaryrefslogtreecommitdiff
path: root/op.h
diff options
context:
space:
mode:
authorBen Morrow <ben@morrow.me.uk>2010-08-14 02:07:09 +0100
committerJan Dubois <jand@activestate.com>2010-08-20 18:34:09 -0700
commit16c915390a3e066a7c2c13fac10d8dd8ebfea0c6 (patch)
treea6b0edcad061ae27097b6ba19e535af2fa232ffb /op.h
parentd88e091f660036722622a815efa9ef3779605ea6 (diff)
downloadperl-16c915390a3e066a7c2c13fac10d8dd8ebfea0c6.tar.gz
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.
Diffstat (limited to 'op.h')
-rw-r--r--op.h4
1 files changed, 2 insertions, 2 deletions
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<arg> depends on I<which>.
hk = INT2PTR(BHK *, SvIVX(sv)); \
\
if (BhkENTRY(hk, which)) \
- CALL_FPTR(BhkENTRY(hk, which))(aTHX_ arg); \
+ BhkENTRY(hk, which)(aTHX_ arg); \
} \
} \
} STMT_END