X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlio.c;h=fa2cd8372c9ea9fed06cd40b8da21c70a2ec5653;hb=5c1546dc48d585e2ab2e244b01f0213280b12017;hp=b0649df0875dad3ea689ce97b35577977c6957fc;hpb=862083f7e40bc2a9e3b94aedce56c1336e7bdb25;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlio.c b/perlio.c
index b0649df..fa2cd83 100644
--- a/perlio.c
+++ b/perlio.c
@@ -1070,7 +1070,7 @@ PerlIO_default_layers(pTHX)
 	PerlIO_funcs *osLayer = &PerlIO_unix;
 	PL_def_layerlist = PerlIO_list_alloc(aTHX);
 	PerlIO_define_layer(aTHX_ & PerlIO_unix);
-#if defined(WIN32) && !defined(UNDER_CE)
+#if defined(WIN32)
 	PerlIO_define_layer(aTHX_ & PerlIO_win32);
 #if 0
 	osLayer = &PerlIO_win32;
@@ -2980,6 +2980,8 @@ PerlIOStdio_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
 	}
 	else
 	    got = PerlSIO_fread(vbuf, 1, count, s);
+	if (got == 0 && PerlSIO_ferror(s))
+	    got = -1;
 	if (got >= 0 || errno != EINTR)
 	    break;
 	PERL_ASYNC_CHECK();