summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2006-01-13 21:16:08 +0000
committerNicholas Clark <nick@ccl4.org>2006-01-13 21:16:08 +0000
commit3c76464f0ee495dc9afe3be36940db3232575632 (patch)
treeaed1086ef4a3ff6a8ce13e440c18b8be82c37a45
parent9db3893e18e69140a8527a132aac2a2e446797ec (diff)
downloadperl-3c76464f0ee495dc9afe3be36940db3232575632.tar.gz
Integrate:
[ 26069] Make Perl_seed public Fixes Win32 linker error in List::Util introduced by change #26054 p4raw-link: @26069 on //depot/perl: 0a87c45925ff377a5a12eedc88c116133919463d p4raw-link: @26054 on //depot/perl: 82f35e8b14e93ac697812d1b28d2e79e1ad82d84 p4raw-id: //depot/maint-5.8/perl@26836 p4raw-integrated: from //depot/perl@26069 'merge in' global.sym (@25954..) embed.fnc embed.h (@26028..)
-rw-r--r--embed.fnc2
-rw-r--r--embed.h4
-rw-r--r--global.sym1
3 files changed, 6 insertions, 1 deletions
diff --git a/embed.fnc b/embed.fnc
index f588aa3099..974739d9b0 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -867,7 +867,7 @@ p |void |vivify_defelem |NN SV* sv
p |void |vivify_ref |NN SV* sv|U32 to_what
p |I32 |wait4pid |Pid_t pid|NN int* statusp|int flags
p |U32 |parse_unicode_opts|NN char **popt
-p |U32 |seed
+Ap |U32 |seed
pR |UV |get_hash_seed
p |void |report_evil_fh |NULLOK GV *gv|NULLOK IO *io|I32 op
pd |void |report_uninit
diff --git a/embed.h b/embed.h
index f86d313ac8..d3fad98c31 100644
--- a/embed.h
+++ b/embed.h
@@ -912,7 +912,9 @@
#define vivify_ref Perl_vivify_ref
#define wait4pid Perl_wait4pid
#define parse_unicode_opts Perl_parse_unicode_opts
+#endif
#define seed Perl_seed
+#ifdef PERL_CORE
#define get_hash_seed Perl_get_hash_seed
#define report_evil_fh Perl_report_evil_fh
#define report_uninit Perl_report_uninit
@@ -2955,7 +2957,9 @@
#define vivify_ref(a,b) Perl_vivify_ref(aTHX_ a,b)
#define wait4pid(a,b,c) Perl_wait4pid(aTHX_ a,b,c)
#define parse_unicode_opts(a) Perl_parse_unicode_opts(aTHX_ a)
+#endif
#define seed() Perl_seed(aTHX)
+#ifdef PERL_CORE
#define get_hash_seed() Perl_get_hash_seed(aTHX)
#define report_evil_fh(a,b,c) Perl_report_evil_fh(aTHX_ a,b,c)
#define report_uninit() Perl_report_uninit(aTHX)
diff --git a/global.sym b/global.sym
index fa6551aa1e..c573131150 100644
--- a/global.sym
+++ b/global.sym
@@ -546,6 +546,7 @@ Perl_uvchr_to_utf8_flags
Perl_uvuni_to_utf8_flags
Perl_pv_uni_display
Perl_sv_uni_display
+Perl_seed
Perl_warn
Perl_vwarn
Perl_warner