X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objXSUB.h;h=564bd9c4ab66cb9ac169605c3c231fbca30e4ac8;hb=68de02dd13dd306ab38a3120f53d4d0e47862ec5;hp=ecdaea5236f0e5a772020ac41c4873935e579d63;hpb=c9242e489bb96da0966a8aebd4b60579ca9623f3;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/objXSUB.h b/objXSUB.h
index ecdaea5..564bd9c 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -795,6 +795,10 @@
 #define Perl_leave_scope	pPerl->Perl_leave_scope
 #undef  leave_scope
 #define leave_scope		Perl_leave_scope
+#undef  Perl_op_null
+#define Perl_op_null		pPerl->Perl_op_null
+#undef  op_null
+#define op_null			Perl_op_null
 #undef  Perl_load_module
 #define Perl_load_module	pPerl->Perl_load_module
 #undef  load_module
@@ -807,6 +811,14 @@
 #define Perl_looks_like_number	pPerl->Perl_looks_like_number
 #undef  looks_like_number
 #define looks_like_number	Perl_looks_like_number
+#undef  Perl_grok_number
+#define Perl_grok_number	pPerl->Perl_grok_number
+#undef  grok_number
+#define grok_number		Perl_grok_number
+#undef  Perl_grok_numeric_radix
+#define Perl_grok_numeric_radix	pPerl->Perl_grok_numeric_radix
+#undef  grok_numeric_radix
+#define grok_numeric_radix	Perl_grok_numeric_radix
 #if defined(USE_THREADS)
 #endif
 #if defined(USE_LOCALE_COLLATE)
@@ -873,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
@@ -897,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
@@ -1645,6 +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_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
@@ -2340,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
@@ -2351,15 +2381,19 @@
 #  endif
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT)
+#  ifdef DEBUGGING
+#  endif
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
+#   ifdef DEBUGGING
+#   endif
 #endif
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
-#  if defined(DEBUGGING)
+#  ifdef DEBUGGING
 #  endif
 #  if !defined(NV_PRESERVES_UV)
 #  endif
@@ -2367,6 +2401,8 @@
 #  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
+#  if defined(DEBUGGING)
+#  endif
 #if 0
 #endif
 #  if defined(CRIPPLED_CC)
@@ -2376,12 +2412,42 @@
 #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
 #endif
 #if defined(PERL_OBJECT)
 #endif
+#undef  Perl_sv_setsv_flags
+#define Perl_sv_setsv_flags	pPerl->Perl_sv_setsv_flags
+#undef  sv_setsv_flags
+#define sv_setsv_flags		Perl_sv_setsv_flags
+#undef  Perl_sv_catpvn_flags
+#define Perl_sv_catpvn_flags	pPerl->Perl_sv_catpvn_flags
+#undef  sv_catpvn_flags
+#define sv_catpvn_flags		Perl_sv_catpvn_flags
+#undef  Perl_sv_catsv_flags
+#define Perl_sv_catsv_flags	pPerl->Perl_sv_catsv_flags
+#undef  sv_catsv_flags
+#define sv_catsv_flags		Perl_sv_catsv_flags
+#undef  Perl_sv_utf8_upgrade_flags
+#define Perl_sv_utf8_upgrade_flags	pPerl->Perl_sv_utf8_upgrade_flags
+#undef  sv_utf8_upgrade_flags
+#define sv_utf8_upgrade_flags	Perl_sv_utf8_upgrade_flags
+#undef  Perl_sv_pvn_force_flags
+#define Perl_sv_pvn_force_flags	pPerl->Perl_sv_pvn_force_flags
+#undef  sv_pvn_force_flags
+#define sv_pvn_force_flags	Perl_sv_pvn_force_flags
+#undef  Perl_sv_2pv_flags
+#define Perl_sv_2pv_flags	pPerl->Perl_sv_2pv_flags
+#undef  sv_2pv_flags
+#define sv_2pv_flags		Perl_sv_2pv_flags
+#undef  Perl_my_atof2
+#define Perl_my_atof2		pPerl->Perl_my_atof2
+#undef  my_atof2
+#define my_atof2		Perl_my_atof2
 
 #endif  /* PERL_CORE && PERL_OBJECT */
 #endif	/* __objXSUB_h__ */