X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objXSUB.h;h=86200bc9a1b815309cfcba2b593fb5f006bf6c90;hb=c44d3fdb45c0c48dcd8af6dc9f4a4166137bf839;hp=1243e9e6683e31b20b143f6b77f323c9d37f5e72;hpb=827e134a90c4e2814fe47bdf310ed7e78fd7f61c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/objXSUB.h b/objXSUB.h
index 1243e9e..86200bc 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -13,7 +13,6 @@
 /* XXX soon to be eliminated, only a few things in PERLCORE need these now */
 
 #if defined(PERL_IMPLICIT_SYS)
-#else
 #endif
 #if defined(USE_ITHREADS)
 #  if defined(PERL_IMPLICIT_SYS)
@@ -1738,6 +1737,10 @@
 #define Perl_sv_vsetpvfn	pPerl->Perl_sv_vsetpvfn
 #undef  sv_vsetpvfn
 #define sv_vsetpvfn		Perl_sv_vsetpvfn
+#undef  Perl_str_to_version
+#define Perl_str_to_version	pPerl->Perl_str_to_version
+#undef  str_to_version
+#define str_to_version		Perl_str_to_version
 #undef  Perl_swash_init
 #define Perl_swash_init		pPerl->Perl_swash_init
 #undef  swash_init
@@ -1987,6 +1990,7 @@
 #define Perl_magic_dump		pPerl->Perl_magic_dump
 #undef  magic_dump
 #define magic_dump		Perl_magic_dump
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
 #undef  Perl_default_protect
 #define Perl_default_protect	pPerl->Perl_default_protect
 #undef  default_protect
@@ -1995,6 +1999,7 @@
 #define Perl_vdefault_protect	pPerl->Perl_vdefault_protect
 #undef  vdefault_protect
 #define vdefault_protect	Perl_vdefault_protect
+#endif
 #undef  Perl_reginitcolors
 #define Perl_reginitcolors	pPerl->Perl_reginitcolors
 #undef  reginitcolors
@@ -2023,6 +2028,22 @@
 #define Perl_sv_pvbyte		pPerl->Perl_sv_pvbyte
 #undef  sv_pvbyte
 #define sv_pvbyte		Perl_sv_pvbyte
+#undef  Perl_sv_utf8_upgrade
+#define Perl_sv_utf8_upgrade	pPerl->Perl_sv_utf8_upgrade
+#undef  sv_utf8_upgrade
+#define sv_utf8_upgrade		Perl_sv_utf8_upgrade
+#undef  Perl_sv_utf8_downgrade
+#define Perl_sv_utf8_downgrade	pPerl->Perl_sv_utf8_downgrade
+#undef  sv_utf8_downgrade
+#define sv_utf8_downgrade	Perl_sv_utf8_downgrade
+#undef  Perl_sv_utf8_encode
+#define Perl_sv_utf8_encode	pPerl->Perl_sv_utf8_encode
+#undef  sv_utf8_encode
+#define sv_utf8_encode		Perl_sv_utf8_encode
+#undef  Perl_sv_utf8_decode
+#define Perl_sv_utf8_decode	pPerl->Perl_sv_utf8_decode
+#undef  sv_utf8_decode
+#define sv_utf8_decode		Perl_sv_utf8_decode
 #undef  Perl_sv_force_normal
 #define Perl_sv_force_normal	pPerl->Perl_sv_force_normal
 #undef  sv_force_normal
@@ -2135,12 +2156,16 @@
 #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT)
 #  if defined(IAMSUID)
 #  endif
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
+#endif
 #  if defined(USE_THREADS)
 #  endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
 #endif
 #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
+#endif
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #endif