Oh, bother. In Tru64 cc -std1 was looking rather nice

in speed (upto 20% speedup in certain operations) but meanwhile
regexps and arithmetics got slower (5-10%) (according to
perlbench average speedup is negligible, and within measuring
flutter, 1%).  Therefore retracting all the changes
aimed at getting -std1 to compile cleanly:  #12475, #12476,
#12479, #12480, #12481, #12482, #12483, #12484.

p4raw-id: //depot/perl@12485

1 files changed, 2 insertions, 8 deletions

diff --git a/mg.c b/mg.c
index 34bd9a4c62..4e186e0c5f 100644
--- a/mg.c
+++ b/mg.c
@@ -1964,14 +1964,8 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
 	    STATUS_POSIX_SET(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 	break;
     case '!':
-        /* Don't be merge these two SETERRNO calls because
-	 * the idea is to make non-VMS places not to see
-	 * the dollar in the identifier: that is non-ANSI. */
-#ifdef VMS
-	SETERRNO(0, (SvIV(sv) == EVMSERR) ? 4 : vaxc$errno);
-#else
-	SETERRNO(SvIOK(sv) ? SvIVX(sv) : SvOK(sv) ? sv_2iv(sv) : 0, 0);
-#endif
+	SETERRNO(SvIOK(sv) ? SvIVX(sv) : SvOK(sv) ? sv_2iv(sv) : 0,
+		 (SvIV(sv) == EVMSERR) ? 4 : vaxc$errno);
 	break;
     case '<':
 	PL_uid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);