Edit ChangeLog, Bump VERSION before rebase/release

[perl5.git] / mg.h

diff --git a/mg.h b/mg.h
index 3362854..4114941 100644 (file)
--- a/mg.h
+++ b/mg.h
@@ -8,21 +8,17 @@
  *
  */
 
-#ifdef STRUCT_MGVTBL_DEFINITION
-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
 
 struct magic {
     MAGIC*     mg_moremagic;
@@ -61,12 +57,14 @@ struct magic {
 #define SvTIED_obj(sv,mg) \
     ((mg)->mg_obj ? (mg)->mg_obj : sv_2mortal(newRV(sv)))
 
+#define whichsig(pv) whichsig_pv(pv)
+
 /*
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */