From: Gurusamy Sarathy Date: Fri, 31 Aug 2001 21:02:54 +0000 (+0000) Subject: integrate change#11801 from maint-5.6 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=06039172f345fd0b8aaa2a469ee190f34bf73239;p=p5sagit%2Fp5-mst-13.2.git integrate change#11801 from maint-5.6 remove age-old UNICOS "workaround" that introduces a static, and hence an egregious race condition for threaded builds (*sigh* beats me why this kludge wasn't guarded by a UNICOS-specific #define *sigh*) p4raw-link: @11801 on //depot/maint-5.6/perl: 5af842af85d9b6d73b06373813fcf66e62026afd p4raw-id: //depot/perl@11804 --- diff --git a/perl.c b/perl.c index f78d9b7..8cc88f2 100644 --- a/perl.c +++ b/perl.c @@ -3297,16 +3297,10 @@ S_nuke_stacks(pTHX) Safefree(PL_retstack); } -#ifndef PERL_OBJECT -static PerlIO *tmpfp; /* moved outside init_lexer() because of UNICOS bug */ -#endif - STATIC void S_init_lexer(pTHX) { -#ifdef PERL_OBJECT - PerlIO *tmpfp; -#endif + PerlIO *tmpfp; tmpfp = PL_rsfp; PL_rsfp = Nullfp; lex_start(PL_linestr);