summaryrefslogtreecommitdiff
path: root/toke.c
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 /toke.c
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 'toke.c')
-rw-r--r--toke.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/toke.c b/toke.c
index 544cd1a754..b8eb11a6ae 100644
--- a/toke.c
+++ b/toke.c
@@ -6131,7 +6131,7 @@ Perl_yylex(pTHX)
int result;
char *saved_bufptr = PL_bufptr;
PL_bufptr = s;
- result = CALL_FPTR(PL_keyword_plugin)(aTHX_ PL_tokenbuf, len, &o);
+ result = PL_keyword_plugin(aTHX_ PL_tokenbuf, len, &o);
s = PL_bufptr;
if (result == KEYWORD_PLUGIN_DECLINE) {
/* not a plugged-in keyword */