Integrate mainline

[p5sagit/p5-mst-13.2.git] / objXSUB.h

diff --git a/objXSUB.h b/objXSUB.h
index 3d0591c..f9f48d1 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -35,6 +35,10 @@
 #define Perl_Gv_AMupdate       pPerl->Perl_Gv_AMupdate
 #undef  Gv_AMupdate
 #define Gv_AMupdate            Perl_Gv_AMupdate
+#undef  Perl_gv_handler
+#define Perl_gv_handler                pPerl->Perl_gv_handler
+#undef  gv_handler
+#define gv_handler             Perl_gv_handler
 #undef  Perl_apply_attrs_string
 #define Perl_apply_attrs_string        pPerl->Perl_apply_attrs_string
 #undef  apply_attrs_string
@@ -321,6 +325,10 @@
 #define Perl_do_open9          pPerl->Perl_do_open9
 #undef  do_open9
 #define do_open9               Perl_do_open9
+#undef  Perl_do_openn
+#define Perl_do_openn          pPerl->Perl_do_openn
+#undef  do_openn
+#define do_openn               Perl_do_openn
 #undef  Perl_dowantarray
 #define Perl_dowantarray       pPerl->Perl_dowantarray
 #undef  dowantarray
@@ -1259,6 +1267,10 @@
 #define Perl_regdump           pPerl->Perl_regdump
 #undef  regdump
 #define regdump                        Perl_regdump
+#undef  Perl_regclass_swash
+#define Perl_regclass_swash    pPerl->Perl_regclass_swash
+#undef  regclass_swash
+#define regclass_swash         Perl_regclass_swash
 #undef  Perl_pregexec
 #define Perl_pregexec          pPerl->Perl_pregexec
 #undef  pregexec
@@ -1741,6 +1753,10 @@
 #define Perl_sv_setref_iv      pPerl->Perl_sv_setref_iv
 #undef  sv_setref_iv
 #define sv_setref_iv           Perl_sv_setref_iv
+#undef  Perl_sv_setref_uv
+#define Perl_sv_setref_uv      pPerl->Perl_sv_setref_uv
+#undef  sv_setref_uv
+#define sv_setref_uv           Perl_sv_setref_uv
 #undef  Perl_sv_setref_nv
 #define Perl_sv_setref_nv      pPerl->Perl_sv_setref_nv
 #undef  sv_setref_nv
@@ -1877,6 +1893,10 @@
 #define Perl_utf8_to_bytes     pPerl->Perl_utf8_to_bytes
 #undef  utf8_to_bytes
 #define utf8_to_bytes          Perl_utf8_to_bytes
+#undef  Perl_bytes_from_utf8
+#define Perl_bytes_from_utf8   pPerl->Perl_bytes_from_utf8
+#undef  bytes_from_utf8
+#define bytes_from_utf8                Perl_bytes_from_utf8
 #undef  Perl_bytes_to_utf8
 #define Perl_bytes_to_utf8     pPerl->Perl_bytes_to_utf8
 #undef  bytes_to_utf8
@@ -1914,7 +1934,6 @@
 #undef  whichsig
 #define whichsig               Perl_whichsig
 #ifdef USE_PURE_BISON
-#else
 #endif
 #if defined(MYMALLOC)
 #undef  Perl_dump_mstats
@@ -2233,6 +2252,14 @@
 #define Perl_ptr_table_split   pPerl->Perl_ptr_table_split
 #undef  ptr_table_split
 #define ptr_table_split                Perl_ptr_table_split
+#undef  Perl_ptr_table_clear
+#define Perl_ptr_table_clear   pPerl->Perl_ptr_table_clear
+#undef  ptr_table_clear
+#define ptr_table_clear                Perl_ptr_table_clear
+#undef  Perl_ptr_table_free
+#define Perl_ptr_table_free    pPerl->Perl_ptr_table_free
+#undef  ptr_table_free
+#define ptr_table_free         Perl_ptr_table_free
 #endif
 #if defined(HAVE_INTERP_INTERN)
 #undef  Perl_sys_intern_clear
@@ -2258,6 +2285,8 @@
 #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT)
 #endif
 #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT)
+#  if defined(DEBUG_CLOSURES)
+#  endif
 #  if defined(PL_OP_SLAB_ALLOC)
 #  endif
 #endif
@@ -2294,6 +2323,8 @@
 #  endif
 #  if !defined(NV_PRESERVES_UV)
 #  endif
+#  if defined(USE_ITHREADS)
+#  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 #if 0