diff options
| -rw-r--r-- | embedvar.h | 1 | ||||
| -rw-r--r-- | intrpvar.h | 3 | ||||
| -rw-r--r-- | makedef.pl | 1 | ||||
| -rw-r--r-- | perl.h | 3 | ||||
| -rw-r--r-- | pp.c | 5 | ||||
| -rw-r--r-- | sv.c | 4 | ||||
| -rw-r--r-- | toke.c | 7 |
7 files changed, 5 insertions, 19 deletions
diff --git a/embedvar.h b/embedvar.h index f9706b14a7..4427e0750e 100644 --- a/embedvar.h +++ b/embedvar.h @@ -107,7 +107,6 @@ #define PL_comppad_name_floor (vTHX->Icomppad_name_floor) #define PL_constpadix (vTHX->Iconstpadix) #define PL_cop_seqmax (vTHX->Icop_seqmax) -#define PL_cryptseen (vTHX->Icryptseen) #define PL_curcop (vTHX->Icurcop) #define PL_curcopdb (vTHX->Icurcopdb) #define PL_curlocales (vTHX->Icurlocales) diff --git a/intrpvar.h b/intrpvar.h index 7ac68e4c01..7f86954903 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -743,6 +743,9 @@ PERLVARI(I, underlying_numeric_obj, locale_t, NULL) # endif #endif /* !USE_LOCALE_NUMERIC */ +PERLVAR(I, pad_reset_pending, bool) /* reset pad on next attempted alloc */ +PERLVAR(I, srand_called, bool) + /* Array of signal handlers, indexed by signal number, through which the C signal handler dispatches. */ PERLVAR(I, psig_ptr, SV **) diff --git a/makedef.pl b/makedef.pl index 41cfecbf95..9af199d9a2 100644 --- a/makedef.pl +++ b/makedef.pl @@ -219,7 +219,6 @@ sub readvar { if ($ARGS{PLATFORM} ne 'os2') { ++$skip{$_} foreach qw( - PL_cryptseen PL_opsave Perl_dump_fds Perl_my_bcopy @@ -4956,9 +4956,6 @@ EXTCONST char PL_bincompat_options[] = # ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP " DEBUG_LEAKING_SCALARS_FORK_DUMP" # endif -# ifdef FCRYPT - " FCRYPT" -# endif # ifdef HAS_TIMES " HAS_TIMES" # endif @@ -3684,11 +3684,8 @@ PP(pp_crypt) # endif /* HAS_CRYPT_R */ # endif /* USE_ITHREADS */ -# ifdef FCRYPT - sv_setpv(TARG, fcrypt(tmps, SvPV_nolen_const(right))); -# else sv_setpv(TARG, PerlProc_crypt(tmps, SvPV_nolen_const(right))); -# endif + SvUTF8_off(TARG); SETTARG; RETURN; @@ -15334,10 +15334,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_cv_has_eval = proto_perl->Icv_has_eval; -#ifdef FCRYPT - PL_cryptseen = proto_perl->Icryptseen; -#endif - #ifdef USE_LOCALE_COLLATE PL_collation_ix = proto_perl->Icollation_ix; PL_collation_standard = proto_perl->Icollation_standard; @@ -7675,12 +7675,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct UNI(OP_CALLER); case KEY_crypt: -#ifdef FCRYPT - if (!PL_cryptseen) { - PL_cryptseen = TRUE; - init_des(); - } -#endif + LOP(OP_CRYPT,XTERM); case KEY_chmod: |