integrate change#3229 from maint-5.004

p4raw-link: @3229 on //depot/maint-5.004/perl: 3e0793ddbcfdff90910112e638ae702c43386bb6

p4raw-id: //depot/perl@3271

1 files changed, 11 insertions, 2 deletions

diff --git a/util.c b/util.c
index 0b3673e049..b6a9fe0667 100644
--- a/util.c
+++ b/util.c
@@ -1349,8 +1349,17 @@ croak(const char* pat, ...)
 	PL_restartop = die_where(message);
 	JMPENV_JUMP(3);
     }
-    PerlIO_puts(PerlIO_stderr(),message);
-    (void)PerlIO_flush(PerlIO_stderr());
+    {
+#ifdef USE_SFIO
+	/* SFIO can really mess with your errno */
+	int e = errno;
+#endif
+	PerlIO_puts(PerlIO_stderr(), message);
+	(void)PerlIO_flush(PerlIO_stderr());
+#ifdef USE_SFIO
+	errno = e;
+#endif
+    }
     my_failure_exit();
 }