Change 34569 by [EMAIL PROTECTED] on 2008/10/24 16:37:49
Run 'make regen' for #34567 and #34568.
Affected files ...
... //depot/perl/embed.h#764 edit
... //depot/perl/embedvar.h#265 edit
... //depot/perl/perlapi.h#187 edit
... //depot/perl/proto.h#954 edit
Differences ...
==== //depot/perl/embed.h#764 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#763~34358~ 2008-09-13 01:44:30.000000000 -0700
+++ perl/embed.h 2008-10-24 09:37:49.000000000 -0700
@@ -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
==== //depot/perl/embedvar.h#265 (text+w) ====
Index: perl/embedvar.h
--- perl/embedvar.h#264~32954~ 2008-01-11 05:55:07.000000000 -0800
+++ perl/embedvar.h 2008-10-24 09:37:49.000000000 -0700
@@ -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
==== //depot/perl/perlapi.h#187 (text+w) ====
Index: perl/perlapi.h
--- perl/perlapi.h#186~32954~ 2008-01-11 05:55:07.000000000 -0800
+++ perl/perlapi.h 2008-10-24 09:37:49.000000000 -0700
@@ -636,6 +636,8 @@
#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
==== //depot/perl/proto.h#954 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#953~34358~ 2008-09-13 01:44:30.000000000 -0700
+++ perl/proto.h 2008-10-24 09:37:49.000000000 -0700
@@ -5887,6 +5887,15 @@
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)
End of Patch.
