Rename get_seed() to get_hash_seed(), as suggested by

Eric J Kidder, to solve a name conflict on HP_UX 11.00.

p4raw-id: //depot/perl@20170

diff --git a/embed.fnc b/embed.fnc
index c138f76..6b2971d 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -839,7 +839,7 @@ p   |void   |vivify_ref     |SV* sv|U32 to_what
 p      |I32    |wait4pid       |Pid_t pid|int* statusp|int flags
 p      |U32    |parse_unicode_opts|char **popt
 p      |U32    |seed
-p      |UV     |get_seed
+p      |UV     |get_hash_seed
 p      |void   |report_evil_fh |GV *gv|IO *io|I32 op
 pd     |void   |report_uninit
 Afpd   |void   |warn           |const char* pat|...

diff --git a/embed.h b/embed.h
index add142d..5cbcb77 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -1115,7 +1115,7 @@
 #define seed                   Perl_seed
 #endif
 #ifdef PERL_CORE
-#define get_seed               Perl_get_seed
+#define get_hash_seed          Perl_get_hash_seed
 #endif
 #ifdef PERL_CORE
 #define report_evil_fh         Perl_report_evil_fh
@@ -3606,7 +3606,7 @@
 #define seed()                 Perl_seed(aTHX)
 #endif
 #ifdef PERL_CORE
-#define get_seed()             Perl_get_seed(aTHX)
+#define get_hash_seed()                Perl_get_hash_seed(aTHX)
 #endif
 #ifdef PERL_CORE
 #define report_evil_fh(a,b,c)  Perl_report_evil_fh(aTHX_ a,b,c)

diff --git a/perl.c b/perl.c
index df11879..bfe3ccc 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -903,7 +903,7 @@ setuid perl scripts securely.\n");
      * If you set PL_hash_seed (and assumedly also PL_hash_seed_set) yourself,
      * it is your responsibility to provide a good random seed! */
     if (!PL_hash_seed_set)
-        PL_hash_seed = get_seed();
+        PL_hash_seed = get_hash_seed();
     {
         char *s = PerlEnv_getenv("PERL_HASH_SEED_DEBUG");
 

diff --git a/proto.h b/proto.h
index 57f7027..e8f3b84 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -799,7 +799,7 @@ PERL_CALLCONV void  Perl_vivify_ref(pTHX_ SV* sv, U32 to_what);
 PERL_CALLCONV I32      Perl_wait4pid(pTHX_ Pid_t pid, int* statusp, int flags);
 PERL_CALLCONV U32      Perl_parse_unicode_opts(pTHX_ char **popt);
 PERL_CALLCONV U32      Perl_seed(pTHX);
-PERL_CALLCONV UV       Perl_get_seed(pTHX);
+PERL_CALLCONV UV       Perl_get_hash_seed(pTHX);
 PERL_CALLCONV void     Perl_report_evil_fh(pTHX_ GV *gv, IO *io, I32 op);
 PERL_CALLCONV void     Perl_report_uninit(pTHX);
 PERL_CALLCONV void     Perl_warn(pTHX_ const char* pat, ...)

diff --git a/util.c b/util.c
index f75f938..9a43d67 100644 (file)
--- a/util.c
+++ b/util.c
@@ -4378,7 +4378,7 @@ Perl_seed(pTHX)
 }
 
 UV
-Perl_get_seed(pTHX)
+Perl_get_hash_seed(pTHX)
 {
      char *s = PerlEnv_getenv("PERL_HASH_SEED");
      UV myseed = 0;