From: Marcus Holland-Moritz <mhx-perl@gmx.net>
Date: Fri, 24 Oct 2008 16:37:49 +0000 (+0000)
Subject: Run 'make regen' for #34567 and #34568.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=56b5603ec7962bbd71d2b0950444e5617e6c8329;p=p5sagit%2Fp5-mst-13.2.git

Run 'make regen' for #34567 and #34568.

p4raw-id: //depot/perl@34569
---

diff --git a/embed.h b/embed.h
index dfe0dea..6778ea5 100644
--- a/embed.h
+++ b/embed.h
@@ -1596,6 +1596,11 @@
 #define vdie_common		S_vdie_common
 #define write_no_mem		S_write_no_mem
 #endif
+#if defined(PERL_MEM_LOG) && defined(PERL_MEM_LOG_STDERR)
+#ifdef PERL_CORE
+#define mem_log_common		S_mem_log_common
+#endif
+#endif
 #endif
 #if defined(PERL_IN_NUMERIC_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
@@ -3917,6 +3922,11 @@
 #define vdie_common(a,b,c,d)	S_vdie_common(aTHX_ a,b,c,d)
 #define write_no_mem()		S_write_no_mem(aTHX)
 #endif
+#if defined(PERL_MEM_LOG) && defined(PERL_MEM_LOG_STDERR)
+#ifdef PERL_CORE
+#define mem_log_common		S_mem_log_common
+#endif
+#endif
 #endif
 #if defined(PERL_IN_NUMERIC_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
diff --git a/embedvar.h b/embedvar.h
index 71199c9..ef8c378 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -300,6 +300,7 @@
 #define PL_sv_no		(vTHX->Isv_no)
 #define PL_sv_objcount		(vTHX->Isv_objcount)
 #define PL_sv_root		(vTHX->Isv_root)
+#define PL_sv_serial		(vTHX->Isv_serial)
 #define PL_sv_undef		(vTHX->Isv_undef)
 #define PL_sv_yes		(vTHX->Isv_yes)
 #define PL_sys_intern		(vTHX->Isys_intern)
@@ -611,6 +612,7 @@
 #define PL_Isv_no		PL_sv_no
 #define PL_Isv_objcount		PL_sv_objcount
 #define PL_Isv_root		PL_sv_root
+#define PL_Isv_serial		PL_sv_serial
 #define PL_Isv_undef		PL_sv_undef
 #define PL_Isv_yes		PL_sv_yes
 #define PL_Isys_intern		PL_sys_intern
diff --git a/perlapi.h b/perlapi.h
index d1c3404..45146bc 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -636,6 +636,8 @@ END_EXTERN_C
 #define PL_sv_objcount		(*Perl_Isv_objcount_ptr(aTHX))
 #undef  PL_sv_root
 #define PL_sv_root		(*Perl_Isv_root_ptr(aTHX))
+#undef  PL_sv_serial
+#define PL_sv_serial		(*Perl_Isv_serial_ptr(aTHX))
 #undef  PL_sv_undef
 #define PL_sv_undef		(*Perl_Isv_undef_ptr(aTHX))
 #undef  PL_sv_yes
diff --git a/proto.h b/proto.h
index f838f5c..29d1b81 100644
--- a/proto.h
+++ b/proto.h
@@ -5887,6 +5887,15 @@ STATIC bool	S_vdie_common(pTHX_ const char *message, STRLEN msglen, I32 utf8, bo
 STATIC char *	S_write_no_mem(pTHX)
 			__attribute__noreturn__;
 
+#if defined(PERL_MEM_LOG) && defined(PERL_MEM_LOG_STDERR)
+STATIC void	S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *typename, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname)
+			__attribute__nonnull__(4)
+			__attribute__nonnull__(8)
+			__attribute__nonnull__(10);
+#define PERL_ARGS_ASSERT_MEM_LOG_COMMON	\
+	assert(typename); assert(filename); assert(funcname)
+
+#endif
 #endif
 
 #if defined(PERL_IN_NUMERIC_C) || defined(PERL_DECL_PROT)