Change 29904 by [EMAIL PROTECTED] on 2007/01/21 00:30:14
Integrate:
[ 27301]
Subject: [PATCH] Perl_save_aelem can't be const
From: Andy Lester <[EMAIL PROTECTED]>
Date: Thu, 23 Feb 2006 22:53:40 -0600
Message-ID: <[EMAIL PROTECTED]>
[ 27339]
ptr_table_find() is only defined with ithreads
Affected files ...
... //depot/maint-5.8/perl/embed.fnc#171 integrate
... //depot/maint-5.8/perl/embed.h#130 integrate
... //depot/maint-5.8/perl/proto.h#160 integrate
... //depot/maint-5.8/perl/scope.c#55 integrate
... //depot/maint-5.8/perl/sv.c#296 integrate
Differences ...
==== //depot/maint-5.8/perl/embed.fnc#171 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#170~29891~ 2007-01-19 16:30:02.000000000 -0800
+++ perl/embed.fnc 2007-01-20 16:30:14.000000000 -0800
@@ -1320,7 +1320,9 @@
s |bool |sv_2iuv_common |NN SV *sv
s |void |glob_assign_glob|NN SV *dstr|NN SV *sstr|const int dtype
s |void |glob_assign_ref|NN SV *dstr|NN SV *sstr
+# if defined(USE_ITHREADS)
sRn |PTR_TBL_ENT_t *|ptr_table_find|NN PTR_TBL_t *tbl|NN const void *sv
+# endif
s |void |reset_amagic |NN SV *rv|const bool on
#endif
==== //depot/maint-5.8/perl/embed.h#130 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#129~29891~ 2007-01-19 16:30:02.000000000 -0800
+++ perl/embed.h 2007-01-20 16:30:14.000000000 -0800
@@ -1353,7 +1353,13 @@
#define sv_2iuv_common S_sv_2iuv_common
#define glob_assign_glob S_glob_assign_glob
#define glob_assign_ref S_glob_assign_ref
+#endif
+# if defined(USE_ITHREADS)
+#ifdef PERL_CORE
#define ptr_table_find S_ptr_table_find
+#endif
+# endif
+#ifdef PERL_CORE
#define reset_amagic S_reset_amagic
#endif
#endif
@@ -3422,7 +3428,13 @@
#define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a)
#define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c)
#define glob_assign_ref(a,b) S_glob_assign_ref(aTHX_ a,b)
+#endif
+# if defined(USE_ITHREADS)
+#ifdef PERL_CORE
#define ptr_table_find S_ptr_table_find
+#endif
+# endif
+#ifdef PERL_CORE
#define reset_amagic(a,b) S_reset_amagic(aTHX_ a,b)
#endif
#endif
==== //depot/maint-5.8/perl/proto.h#160 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#159~29891~ 2007-01-19 16:30:02.000000000 -0800
+++ perl/proto.h 2007-01-20 16:30:14.000000000 -0800
@@ -1917,9 +1917,11 @@
STATIC bool S_sv_2iuv_common(pTHX_ SV *sv);
STATIC void S_glob_assign_glob(pTHX_ SV *dstr, SV *sstr, const int dtype);
STATIC void S_glob_assign_ref(pTHX_ SV *dstr, SV *sstr);
+# if defined(USE_ITHREADS)
STATIC PTR_TBL_ENT_t * S_ptr_table_find(PTR_TBL_t *tbl, const void *sv)
__attribute__warn_unused_result__;
+# endif
STATIC void S_reset_amagic(pTHX_ SV *rv, const bool on);
#endif
==== //depot/maint-5.8/perl/sv.c#296 (text) ====
Index: perl/sv.c
--- perl/sv.c#295~29903~ 2007-01-20 16:16:12.000000000 -0800
+++ perl/sv.c 2007-01-20 16:30:14.000000000 -0800
@@ -9154,7 +9154,7 @@
void
Perl_ptr_table_store(pTHX_ PTR_TBL_t *tbl, void *oldsv, void *newsv)
{
- PTR_TBL_ENT_t *tblent = S_ptr_table_find(tbl, (const void *)oldsv);
+ PTR_TBL_ENT_t *tblent = ptr_table_find(tbl, (const void *)oldsv);
PERL_UNUSED_CONTEXT;
if (tblent) {
End of Patch.
