diff options
| author | Ben Morrow <ben@morrow.me.uk> | 2010-08-14 02:07:09 +0100 |
|---|---|---|
| committer | Jan Dubois <jand@activestate.com> | 2010-08-20 18:34:09 -0700 |
| commit | 16c915390a3e066a7c2c13fac10d8dd8ebfea0c6 (patch) | |
| tree | a6b0edcad061ae27097b6ba19e535af2fa232ffb /op.c | |
| parent | d88e091f660036722622a815efa9ef3779605ea6 (diff) | |
| download | perl-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.c')
| -rw-r--r-- | op.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -103,8 +103,8 @@ recursive, but it's recursive on basic blocks, not on tree nodes. #include "perl.h" #include "keywords.h" -#define CALL_PEEP(o) CALL_FPTR(PL_peepp)(aTHX_ o) -#define CALL_OPFREEHOOK(o) if (PL_opfreehook) CALL_FPTR(PL_opfreehook)(aTHX_ o) +#define CALL_PEEP(o) PL_peepp(aTHX_ o) +#define CALL_OPFREEHOOK(o) if (PL_opfreehook) PL_opfreehook(aTHX_ o) #if defined(PL_OP_SLAB_ALLOC) @@ -305,7 +305,7 @@ Perl_Slab_Free(pTHX_ void *op) ? ( op_free((OP*)o), \ Perl_croak(aTHX_ "'%s' trapped by operation mask", PL_op_desc[type]), \ (OP*)0 ) \ - : CALL_FPTR(PL_check[type])(aTHX_ (OP*)o)) + : PL_check[type](aTHX_ (OP*)o)) #define RETURN_UNLIMITED_NUMBER (PERL_INT_MAX / 2) |