Integrate mainline

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

diff --git a/objXSUB.h b/objXSUB.h
index 1e70169..564bd9c 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -885,7 +885,7 @@
 #define Perl_my_atof           pPerl->Perl_my_atof
 #undef  my_atof
 #define my_atof                        Perl_my_atof
-#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
+#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
 #undef  Perl_my_bcopy
 #define Perl_my_bcopy          pPerl->Perl_my_bcopy
 #undef  my_bcopy
@@ -909,6 +909,18 @@
 #define Perl_my_fflush_all     pPerl->Perl_my_fflush_all
 #undef  my_fflush_all
 #define my_fflush_all          Perl_my_fflush_all
+#undef  Perl_my_fork
+#define Perl_my_fork           pPerl->Perl_my_fork
+#undef  my_fork
+#define my_fork                        Perl_my_fork
+#undef  Perl_atfork_lock
+#define Perl_atfork_lock       pPerl->Perl_atfork_lock
+#undef  atfork_lock
+#define atfork_lock            Perl_atfork_lock
+#undef  Perl_atfork_unlock
+#define Perl_atfork_unlock     pPerl->Perl_atfork_unlock
+#undef  atfork_unlock
+#define atfork_unlock          Perl_atfork_unlock
 #undef  Perl_my_lstat
 #define Perl_my_lstat          pPerl->Perl_my_lstat
 #undef  my_lstat
@@ -1657,10 +1669,10 @@
 #define Perl_sv_compile_2op    pPerl->Perl_sv_compile_2op
 #undef  sv_compile_2op
 #define sv_compile_2op         Perl_sv_compile_2op
-#undef  Perl_sv_getcwd
-#define Perl_sv_getcwd         pPerl->Perl_sv_getcwd
-#undef  sv_getcwd
-#define sv_getcwd              Perl_sv_getcwd
+#undef  Perl_getcwd_sv
+#define Perl_getcwd_sv         pPerl->Perl_getcwd_sv
+#undef  getcwd_sv
+#define getcwd_sv              Perl_getcwd_sv
 #undef  Perl_sv_dec
 #define Perl_sv_dec            pPerl->Perl_sv_dec
 #undef  sv_dec
@@ -1753,10 +1765,6 @@
 #define Perl_sv_pvbyten_force  pPerl->Perl_sv_pvbyten_force
 #undef  sv_pvbyten_force
 #define sv_pvbyten_force       Perl_sv_pvbyten_force
-#undef  Perl_sv_realpath
-#define Perl_sv_realpath       pPerl->Perl_sv_realpath
-#undef  sv_realpath
-#define sv_realpath            Perl_sv_realpath
 #undef  Perl_sv_reftype
 #define Perl_sv_reftype                pPerl->Perl_sv_reftype
 #undef  sv_reftype
@@ -2360,6 +2368,8 @@
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
 #endif
+#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT)
+#endif
 #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
 #if defined(PERL_FLEXIBLE_EXCEPTIONS)
 #endif
@@ -2402,6 +2412,8 @@
 #endif
 #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
 #endif
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
+#endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 #  if defined(LEAKTEST)
 #  endif