Change 27339 by [EMAIL PROTECTED] on 2006/02/27 13:40:44
ptr_table_find() is only defined with ithreads
Affected files ...
... //depot/perl/embed.fnc#319 edit
... //depot/perl/embed.h#563 edit
... //depot/perl/proto.h#666 edit
... //depot/perl/sv.c#1174 edit
Differences ...
==== //depot/perl/embed.fnc#319 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#318~27301~ 2006-02-24 02:54:14.000000000 -0800
+++ perl/embed.fnc 2006-02-27 05:40:44.000000000 -0800
@@ -1352,7 +1352,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 |SV * |find_hash_subscript|NULLOK HV *hv|NN SV *val
s |I32 |find_array_subscript|NULLOK AV *av|NN SV *val
s |SV * |find_uninit_var|NULLOK OP *obase|NULLOK SV *uninit_sv|bool
match
==== //depot/perl/embed.h#563 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#562~27278~ 2006-02-23 03:11:12.000000000 -0800
+++ perl/embed.h 2006-02-27 05:40:44.000000000 -0800
@@ -1376,7 +1376,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 find_hash_subscript S_find_hash_subscript
#define find_array_subscript S_find_array_subscript
#define find_uninit_var S_find_uninit_var
@@ -3440,7 +3446,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 find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b)
#define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b)
#define find_uninit_var(a,b,c) S_find_uninit_var(aTHX_ a,b,c)
==== //depot/perl/proto.h#666 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#665~27301~ 2006-02-24 02:54:14.000000000 -0800
+++ perl/proto.h 2006-02-27 05:40:44.000000000 -0800
@@ -3735,11 +3735,13 @@
__attribute__nonnull__(pTHX_1)
__attribute__nonnull__(pTHX_2);
+# if defined(USE_ITHREADS)
STATIC PTR_TBL_ENT_t * S_ptr_table_find(PTR_TBL_t *tbl, const void *sv)
__attribute__warn_unused_result__
__attribute__nonnull__(1)
__attribute__nonnull__(2);
+# endif
STATIC SV * S_find_hash_subscript(pTHX_ HV *hv, SV *val)
__attribute__nonnull__(pTHX_2);
==== //depot/perl/sv.c#1174 (text) ====
Index: perl/sv.c
--- perl/sv.c#1173~27338~ 2006-02-27 05:28:04.000000000 -0800
+++ perl/sv.c 2006-02-27 05:40:44.000000000 -0800
@@ -9524,7 +9524,7 @@
void
Perl_ptr_table_store(pTHX_ PTR_TBL_t *tbl, const void *oldsv, void *newsv)
{
- PTR_TBL_ENT_t *tblent = S_ptr_table_find(tbl, oldsv);
+ PTR_TBL_ENT_t *tblent = ptr_table_find(tbl, oldsv);
PERL_UNUSED_CONTEXT;
if (tblent) {
End of Patch.
