various shenanigans in change#5342

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

diff --git a/objXSUB.h b/objXSUB.h
index 2897a6a..86200bc 100644 (file)
--- 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
@@ -2151,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