From: Jarkko Hietaniemi Date: Mon, 4 Mar 2002 17:11:19 +0000 (+0000) Subject: Integrate perlio: X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eb31b78e700ea0345396e27142faff79fd75f356;p=p5sagit%2Fp5-mst-13.2.git Integrate perlio: [ 15002] Win32 tweak [ 14999] Win32 hack [ 14995] Remove debugging assert p4raw-link: @15002 on //depot/perlio: 330f1a50c5d35c91987f1aef437dcb98bb1db640 p4raw-link: @14999 on //depot/perlio: aa0955498d45bb8096ef3cae16377877c15810a6 p4raw-link: @14995 on //depot/perlio: 24140e009b1b0a7cb78bf9b74be60f7a30a12452 p4raw-id: //depot/perl@15008 --- diff --git a/ext/threads/shared/shared.xs b/ext/threads/shared/shared.xs index 5f1b340..ee05c57 100644 --- a/ext/threads/shared/shared.xs +++ b/ext/threads/shared/shared.xs @@ -452,7 +452,9 @@ int sharedsv_scalar_mg_free(pTHX_ SV *sv, MAGIC *mg) { shared_sv *shared = (shared_sv *) mg->mg_ptr; +#if 0 assert (SvREFCNT(SHAREDSvPTR(shared)) < 1000); +#endif Perl_sharedsv_free(aTHX_ shared); return 0; } diff --git a/lib/Tie/File/t/16_handle.t b/lib/Tie/File/t/16_handle.t index a438612..5ff3c82 100644 --- a/lib/Tie/File/t/16_handle.t +++ b/lib/Tie/File/t/16_handle.t @@ -14,6 +14,7 @@ print "ok $N\n"; $N++; use Fcntl 'O_CREAT', 'O_RDWR'; sysopen F, $file, O_CREAT | O_RDWR or die "Couldn't create temp file $file: $!; aborting"; +binmode(F); my $o = tie @a, 'Tie::File', \*F; print $o ? "ok $N\n" : "not ok $N\n"; @@ -82,7 +83,7 @@ untie @a; if ($@ && $@ =~ /filehandle does not appear to be seekable/) { print "ok $N\n"; } else { - print "not ok $N\n"; + print "not ok $N # $@\n"; } $N++; }