summaryrefslogtreecommitdiff
path: root/mg.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 /mg.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 'mg.h')
-rw-r--r--mg.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/mg.h b/mg.h
index 33628546c9..848f735d6c 100644
--- a/mg.h
+++ b/mg.h
@@ -12,15 +12,15 @@
STRUCT_MGVTBL_DEFINITION;
#else
struct mgvtbl {
- int (CPERLscope(*svt_get)) (pTHX_ SV *sv, MAGIC* mg);
- int (CPERLscope(*svt_set)) (pTHX_ SV *sv, MAGIC* mg);
- U32 (CPERLscope(*svt_len)) (pTHX_ SV *sv, MAGIC* mg);
- int (CPERLscope(*svt_clear))(pTHX_ SV *sv, MAGIC* mg);
- int (CPERLscope(*svt_free)) (pTHX_ SV *sv, MAGIC* mg);
- int (CPERLscope(*svt_copy)) (pTHX_ SV *sv, MAGIC* mg,
+ int (*svt_get) (pTHX_ SV *sv, MAGIC* mg);
+ int (*svt_set) (pTHX_ SV *sv, MAGIC* mg);
+ U32 (*svt_len) (pTHX_ SV *sv, MAGIC* mg);
+ int (*svt_clear)(pTHX_ SV *sv, MAGIC* mg);
+ int (*svt_free) (pTHX_ SV *sv, MAGIC* mg);
+ int (*svt_copy) (pTHX_ SV *sv, MAGIC* mg,
SV *nsv, const char *name, I32 namlen);
- int (CPERLscope(*svt_dup)) (pTHX_ MAGIC *mg, CLONE_PARAMS *param);
- int (CPERLscope(*svt_local))(pTHX_ SV *nsv, MAGIC *mg);
+ int (*svt_dup) (pTHX_ MAGIC *mg, CLONE_PARAMS *param);
+ int (*svt_local)(pTHX_ SV *nsv, MAGIC *mg);
};
#endif