summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
authorYves Orton <demerphq@gmail.com>2017-04-23 11:47:04 +0200
committerYves Orton <demerphq@gmail.com>2017-04-23 11:47:04 +0200
commiteba287cb48b881ee252ec418246375010c97a85b (patch)
tree292e87a8de014d3789629a1ab55480a352a1a86e /perl.c
parent9627bf7af087e000c169b623f1a4536976a0f6c1 (diff)
downloadperl-eba287cb48b881ee252ec418246375010c97a85b.tar.gz
Revert "get rid of USE_HASH_SEED_EXPLICIT"
This reverts commit dd1b95f812312c85390f487887cdd55282fcd6ce. Accidentally pushed work pending unfreeze.
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl.c b/perl.c
index d7b0866dd0..125afaed51 100644
--- a/perl.c
+++ b/perl.c
@@ -317,13 +317,13 @@ perl_construct(pTHXx)
* a suitable seed yourself and define PERL_HASH_SEED to a well chosen
* string. See hv_func.h for details.
*/
-#if defined(USE_HASH_SEED)
+#if defined(USE_HASH_SEED) || defined(USE_HASH_SEED_EXPLICIT)
/* get the hash seed from the environment or from an RNG */
Perl_get_hash_seed(aTHX_ PL_hash_seed);
-#else
+#else /*if !(defined(USE_HASH_SEED) || defined(USE_HASH_SEED_EXPLICIT)) */
/* they want a hard coded seed, check that it is long enough */
assert( strlen(PERL_HASH_SEED) >= PERL_HASH_SEED_BYTES );
-#endif
+#endif /* #if defined(USE_HASH_SEED) || defined(USE_HASH_SEED_EXPLICIT) */
/* now we use the chosen seed to initialize the state -
* in some configurations this may be a relatively speaking
@@ -1564,7 +1564,7 @@ perl_parse(pTHXx_ XSINIT_t xsinit, int argc, char **argv, char **env)
#ifndef MULTIPLICITY
PERL_UNUSED_ARG(my_perl);
#endif
-#if (defined(USE_HASH_SEED) || defined(USE_HASH_SEED_DEBUG)) && !defined(NO_PERL_HASH_SEED_DEBUG)
+#if (defined(USE_HASH_SEED) || defined(USE_HASH_SEED_EXPLICIT) || defined(USE_HASH_SEED_DEBUG)) && !defined(NO_PERL_HASH_SEED_DEBUG)
{
const char * const s = PerlEnv_getenv("PERL_HASH_SEED_DEBUG");
@@ -1583,7 +1583,7 @@ perl_parse(pTHXx_ XSINIT_t xsinit, int argc, char **argv, char **env)
PerlIO_printf(Perl_debug_log, "\n");
}
}
-#endif /* #if (defined(USE_HASH_SEED) ... */
+#endif /* #if (defined(USE_HASH_SEED) || defined(USE_HASH_SEED_EXPLICIT) ... */
#ifdef __amigaos4__
{
@@ -1869,6 +1869,9 @@ S_Internals_V(pTHX_ CV *cv)
# ifdef USE_FAST_STDIO
" USE_FAST_STDIO"
# endif
+# ifdef USE_HASH_SEED_EXPLICIT
+ " USE_HASH_SEED_EXPLICIT"
+# endif
# ifdef USE_LOCALE
" USE_LOCALE"
# endif