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

10 files changed, 60 insertions, 106 deletions

diff --git a/doio.c b/doio.c
index bdc845ab38..ebcd07194f 100644
--- a/doio.c
+++ b/doio.c
@@ -338,7 +338,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
 			}
 			if (!thatio) {
 #ifdef EINVAL
-			    SETERRNO(EINVAL,VMS_SS_IVCHAN);
+			    SETERRNO(EINVAL,SS$_IVCHAN);
 #endif
 			    goto say_false;
 			}
@@ -898,7 +898,7 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit)
 	gv = PL_argvgv;
     if (!gv || SvTYPE(gv) != SVt_PVGV) {
 	if (not_implicit)
-	    SETERRNO(EBADF,VMS_SS_IVCHAN);
+	    SETERRNO(EBADF,SS$_IVCHAN);
 	return FALSE;
     }
     io = GvIO(gv);
@@ -906,7 +906,7 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit)
 	if (not_implicit) {
 	    if (ckWARN(WARN_UNOPENED)) /* no check for closed here */
 		report_evil_fh(gv, io, PL_op->op_type);
-	    SETERRNO(EBADF,VMS_SS_IVCHAN);
+	    SETERRNO(EBADF,SS$_IVCHAN);
 	}
 	return FALSE;
     }
@@ -950,7 +950,7 @@ Perl_io_close(pTHX_ IO *io, bool not_implicit)
 	IoOFP(io) = IoIFP(io) = Nullfp;
     }
     else if (not_implicit) {
-	SETERRNO(EBADF,VMS_SS_IVCHAN);
+	SETERRNO(EBADF,SS$_IVCHAN);
     }
 
     return retval;
@@ -1025,7 +1025,7 @@ Perl_do_tell(pTHX_ GV *gv)
     }
     if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	report_evil_fh(gv, io, PL_op->op_type);
-    SETERRNO(EBADF,VMS_RMS_IFI);
+    SETERRNO(EBADF,RMS$_IFI);
     return (Off_t)-1;
 }
 
@@ -1044,7 +1044,7 @@ Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
     }
     if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	report_evil_fh(gv, io, PL_op->op_type);
-    SETERRNO(EBADF,VMS_RMS_IFI);
+    SETERRNO(EBADF,RMS$_IFI);
     return FALSE;
 }
 
@@ -1058,7 +1058,7 @@ Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence)
 	return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence);
     if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	report_evil_fh(gv, io, PL_op->op_type);
-    SETERRNO(EBADF,VMS_RMS_IFI);
+    SETERRNO(EBADF,RMS$_IFI);
     return (Off_t)-1;
 }
 
@@ -2034,7 +2034,7 @@ Perl_do_semop(pTHX_ SV **mark, SV **sp)
     opbuf = SvPV(opstr, opsize);
     if (opsize < 3 * SHORTSIZE
 	|| (opsize % (3 * SHORTSIZE))) {
-	SETERRNO(EINVAL,VMS_LIB_INVARG);
+	SETERRNO(EINVAL,LIB$_INVARG);
 	return -1;
     }
     SETERRNO(0,0);
@@ -2091,7 +2091,7 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
     if (shmctl(id, IPC_STAT, &shmds) == -1)
 	return -1;
     if (mpos < 0 || msize < 0 || mpos + msize > shmds.shm_segsz) {
-	SETERRNO(EFAULT,VMS_SS_ACCVIO);		/* can't do as caller requested */
+	SETERRNO(EFAULT,SS$_ACCVIO);		/* can't do as caller requested */
 	return -1;
     }
     shm = (char *)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
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);
diff --git a/miniperlmain.c b/miniperlmain.c
index 34faed695c..f92ea3ee23 100644
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -25,18 +25,8 @@ static PerlInterpreter *my_perl;
 long _stksize = 64 * 1024;
 #endif
 
-/* If the compiler is in such a strict mood that it doesn't
- * even like the third argument of main(). */
-#if (defined(__DECC) && defined(__STDC__) && __STDC__ == 1)
-#   define STRICT_ANSI_DISLIKES_ENVP
-#endif
-
 int
-main(int argc, char **argv
-#ifndef STRICT_ANSI_DISLIKES_ENVP
-     , char **envp
-#endif
-     )
+main(int argc, char **argv, char **env)
 {
     int exitstatus;
 
@@ -56,8 +46,7 @@ main(int argc, char **argv
     /* noop unless Configure is given -Accflags=-DPERL_GPROF_CONTROL */
     PERL_GPROF_MONCONTROL(0);
 
-    /* The default PERL_SYS_INIT3 ignores envp but e.g. OS/2 uses it. */
-    PERL_SYS_INIT3(&argc,&argv,&envp);
+    PERL_SYS_INIT3(&argc,&argv,&env);
 
 #if defined(USE_5005THREADS) || defined(USE_ITHREADS)
     /* XXX Ideally, this should really be happening in perl_alloc() or
diff --git a/perl.c b/perl.c
index 4e62d06504..bd68c411b0 100644
--- a/perl.c
+++ b/perl.c
@@ -1416,7 +1416,7 @@ print \"  \\@INC:\\n    @INC\\n\";");
 
     /* now parse the script */
 
-    SETERRNO(0,VMS_SS_NORMAL);
+    SETERRNO(0,SS$_NORMAL);
     PL_error_count = 0;
 #ifdef MACOS_TRADITIONAL
     if (gMacPerl_SyntaxError = (yyparse() || PL_error_count)) {
diff --git a/perl.h b/perl.h
index d37851c5b5..5e2eede467 100644
--- a/perl.h
+++ b/perl.h
@@ -695,35 +695,6 @@ int sockatmark(int);
 #   define SETERRNO(errcode,vmserrcode) (errno = (errcode))
 #endif
 
-/* These definitions are sneaky.
- * Their only purpose is to avoid warnings on strict ANSI (non-VMS)
- * compilers which can get huffy about dollars in identifiers,
- * which is common practise in VMS.  The definitions in the
- * non-VMS branch are not used (since the VMS error code is
- * unsurprisingly not of much use in non-VMS) -- but their only
- * point is to be something non-dollared.  Neither are all instances
- * of dollared variables hidden this way, only at the spots where
- * non-VMS platforms see them. */
-#ifdef VMS
-#define VMS_LIB_INVARGV	LIB$_INVARG
-#define VMS_RMS_DIR	RMS$_DIR
-#define VMS_RMS_FAC	RMS$_FAC
-#define VMS_RMS_IFI	RMS$_IFI
-#define VMS_RMS_ISI	RMS$_ISI
-#define VMS_SS_ACCVIO	SS$_ACCVIO
-#define VMS_SS_IVCHAN	SS$_IVCHAN
-#define VMS_SS_NORMAL	SS$_NORMAL
-#else
-#define VMS_LIB_INVARG	EINVAL
-#define VMS_RMS_DIR	EBADF
-#define VMS_RMS_FAC	0
-#define VMS_RMS_IFI	EBADF
-#define VMS_RMS_ISI	EBADF
-#define VMS_SS_ACCVIO	EFAULT
-#define VMS_SS_IVCHAN	EBADF
-#define VMS_SS_NORMAL	0
-#endif
-
 #ifdef USE_5005THREADS
 #  define ERRSV (thr->errsv)
 #  define DEFSV THREADSV(0)
diff --git a/perlio.c b/perlio.c
index 638a1be1eb..dd9f394c84 100644
--- a/perlio.c
+++ b/perlio.c
@@ -981,7 +981,7 @@ PerlIO__close(PerlIO *f)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Close) (f);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -998,7 +998,7 @@ PerlIO_fdupopen(pTHX_ PerlIO *f, CLONE_PARAMS *param)
 	return new;
     }
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return NULL;
     }
 }
@@ -1025,7 +1025,7 @@ PerlIO_fileno(PerlIO *f)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Fileno) (f);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1241,7 +1241,7 @@ PerlIO_read(PerlIO *f, void *vbuf, Size_t count)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Read) (f, vbuf, count);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1253,7 +1253,7 @@ PerlIO_unread(PerlIO *f, const void *vbuf, Size_t count)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Unread) (f, vbuf, count);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1265,7 +1265,7 @@ PerlIO_write(PerlIO *f, const void *vbuf, Size_t count)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Write) (f, vbuf, count);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1277,7 +1277,7 @@ PerlIO_seek(PerlIO *f, Off_t offset, int whence)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Seek) (f, offset, whence);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1289,7 +1289,7 @@ PerlIO_tell(PerlIO *f)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Tell) (f);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1306,13 +1306,13 @@ PerlIO_flush(PerlIO *f)
 	    }
 	    else {
 		PerlIO_debug("Cannot flush f=%p :%s\n", f, tab->name);
-		SETERRNO(EBADF, VMS_SS_IVCHAN);
+		SETERRNO(EBADF, SS$_IVCHAN);
 		return -1;
 	    }
 	}
 	else {
 	    PerlIO_debug("Cannot flush f=%p\n", f);
-	    SETERRNO(EBADF, VMS_SS_IVCHAN);
+	    SETERRNO(EBADF, SS$_IVCHAN);
 	    return -1;
 	}
     }
@@ -1365,7 +1365,7 @@ PerlIO_fill(PerlIO *f)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Fill) (f);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1377,7 +1377,7 @@ PerlIO_isutf8(PerlIO *f)
     if (f && *f)
 	return (PerlIOBase(f)->flags & PERLIO_F_UTF8) != 0;
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1389,7 +1389,7 @@ PerlIO_eof(PerlIO *f)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Eof) (f);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1401,7 +1401,7 @@ PerlIO_error(PerlIO *f)
     if (f && *f)
 	return (*PerlIOBase(f)->tab->Error) (f);
     else {
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 	return -1;
     }
 }
@@ -1413,7 +1413,7 @@ PerlIO_clearerr(PerlIO *f)
     if (f && *f)
 	(*PerlIOBase(f)->tab->Clearerr) (f);
     else
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 }
 
 #undef PerlIO_setlinebuf
@@ -1423,7 +1423,7 @@ PerlIO_setlinebuf(PerlIO *f)
     if (f && *f)
 	(*PerlIOBase(f)->tab->Setlinebuf) (f);
     else
-	SETERRNO(EBADF, VMS_SS_IVCHAN);
+	SETERRNO(EBADF, SS$_IVCHAN);
 }
 
 #undef PerlIO_has_base
@@ -1709,7 +1709,7 @@ PerlIOBase_pushed(PerlIO *f, const char *mode, SV *arg)
 	    l->flags |= PERLIO_F_TRUNCATE | PERLIO_F_CANWRITE;
 	    break;
 	default:
-	    SETERRNO(EINVAL, VMS_LIB_INVARG);
+	    SETERRNO(EINVAL, LIB$_INVARG);
 	    return -1;
 	}
 	while (*mode) {
@@ -1724,7 +1724,7 @@ PerlIOBase_pushed(PerlIO *f, const char *mode, SV *arg)
 		l->flags |= PERLIO_F_CRLF;
 		break;
 	    default:
-		SETERRNO(EINVAL, VMS_LIB_INVARG);
+		SETERRNO(EINVAL, LIB$_INVARG);
 		return -1;
 	    }
 	}
@@ -1918,7 +1918,7 @@ PerlIOUnix_oflags(const char *mode)
      */
     oflags |= O_BINARY;
     if (*mode || oflags == -1) {
-	SETERRNO(EINVAL, VMS_LIB_INVARG);
+	SETERRNO(EINVAL, LIB$_INVARG);
 	oflags = -1;
     }
     return oflags;
@@ -3548,7 +3548,7 @@ PerlIOMmap_map(PerlIO *f)
 		if (!page_size) {
 #if defined(HAS_SYSCONF) && (defined(_SC_PAGESIZE) || defined(_SC_PAGE_SIZE))
 		    {
-			SETERRNO(0, VMS_SS_NORMAL);
+			SETERRNO(0, SS$_NORMAL);
 #   ifdef _SC_PAGESIZE
 			page_size = sysconf(_SC_PAGESIZE);
 #   else
@@ -4055,7 +4055,7 @@ PerlIO_setpos(PerlIO *f, SV *pos)
 	if (f && len == sizeof(Off_t))
 	    return PerlIO_seek(f, *posn, SEEK_SET);
     }
-    SETERRNO(EINVAL, VMS_SS_IVCHAN);
+    SETERRNO(EINVAL, SS$_IVCHAN);
     return -1;
 }
 #else
@@ -4075,7 +4075,7 @@ PerlIO_setpos(PerlIO *f, SV *pos)
 #endif
 	}
     }
-    SETERRNO(EINVAL, VMS_SS_IVCHAN);
+    SETERRNO(EINVAL, SS$_IVCHAN);
     return -1;
 }
 #endif
diff --git a/pp_ctl.c b/pp_ctl.c
index 804e84f929..09c1a190c6 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3322,7 +3322,7 @@ trylocal: {
 	RETPUSHUNDEF;
     }
     else
-	SETERRNO(0, VMS_SS_NORMAL);
+	SETERRNO(0, SS$_NORMAL);
 
     /* Assume success here to prevent recursive requirement. */
     len = strlen(name);
diff --git a/pp_hot.c b/pp_hot.c
index a2c16549ea..8c04a70a12 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -590,7 +590,7 @@ PP(pp_print)
             goto had_magic;
 	if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	    report_evil_fh(gv, io, PL_op->op_type);
-	SETERRNO(EBADF,VMS_RMS_IFI);
+	SETERRNO(EBADF,RMS$_IFI);
 	goto just_say_no;
     }
     else if (!(fp = IoOFP(io))) {
@@ -600,7 +600,7 @@ PP(pp_print)
 	    else if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 		report_evil_fh(gv, io, PL_op->op_type);
 	}
-	SETERRNO(EBADF,IoIFP(io)?VMS_RMS_FAC:VMS_RMS_IFI);
+	SETERRNO(EBADF,IoIFP(io)?RMS$_FAC:RMS$_IFI);
 	goto just_say_no;
     }
     else {
diff --git a/pp_sys.c b/pp_sys.c
index 516e7255ff..155872846d 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -1422,7 +1422,7 @@ PP(pp_prtf)
     if (!(io = GvIO(gv))) {
 	if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	    report_evil_fh(gv, io, PL_op->op_type);
-	SETERRNO(EBADF,VMS_RMS_IFI);
+	SETERRNO(EBADF,RMS$_IFI);
 	goto just_say_no;
     }
     else if (!(fp = IoOFP(io))) {
@@ -1444,7 +1444,7 @@ PP(pp_prtf)
 	    else if (ckWARN(WARN_CLOSED))
 		report_evil_fh(gv, io, PL_op->op_type);
 	}
-	SETERRNO(EBADF,IoIFP(io)?VMS_RMS_FAC:VMS_RMS_IFI);
+	SETERRNO(EBADF,IoIFP(io)?RMS$_FAC:RMS$_IFI);
 	goto just_say_no;
     }
     else {
@@ -2080,7 +2080,7 @@ PP(pp_truncate)
 	if (result)
 	    RETPUSHYES;
 	if (!errno)
-	    SETERRNO(EBADF,VMS_RMS_IFI);
+	    SETERRNO(EBADF,RMS$_IFI);
 	RETPUSHUNDEF;
     }
 #else
@@ -2107,7 +2107,7 @@ PP(pp_ioctl)
     if (!io || !argsv || !IoIFP(io)) {
 	if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	    report_evil_fh(gv, io, PL_op->op_type);
-	SETERRNO(EBADF,VMS_RMS_IFI);	/* well, sort of... */
+	SETERRNO(EBADF,RMS$_IFI);	/* well, sort of... */
 	RETPUSHUNDEF;
     }
 
@@ -2195,7 +2195,7 @@ PP(pp_flock)
 	if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	    report_evil_fh(gv, io, PL_op->op_type);
 	value = 0;
-	SETERRNO(EBADF,VMS_RMS_IFI);
+	SETERRNO(EBADF,RMS$_IFI);
     }
     PUSHi(value);
     RETURN;
@@ -2225,7 +2225,7 @@ PP(pp_socket)
 	    report_evil_fh(gv, io, PL_op->op_type);
 	if (IoIFP(io))
 	    do_close(gv, FALSE);
-	SETERRNO(EBADF,VMS_LIB_INVARG);
+	SETERRNO(EBADF,LIB$_INVARG);
 	RETPUSHUNDEF;
     }
 
@@ -2376,7 +2376,7 @@ PP(pp_bind)
 nuts:
     if (ckWARN(WARN_CLOSED))
 	report_evil_fh(gv, io, PL_op->op_type);
-    SETERRNO(EBADF,VMS_SS_IVCHAN);
+    SETERRNO(EBADF,SS$_IVCHAN);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_sock_func, "bind");
@@ -2406,7 +2406,7 @@ PP(pp_connect)
 nuts:
     if (ckWARN(WARN_CLOSED))
 	report_evil_fh(gv, io, PL_op->op_type);
-    SETERRNO(EBADF,VMS_SS_IVCHAN);
+    SETERRNO(EBADF,SS$_IVCHAN);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_sock_func, "connect");
@@ -2432,7 +2432,7 @@ PP(pp_listen)
 nuts:
     if (ckWARN(WARN_CLOSED))
 	report_evil_fh(gv, io, PL_op->op_type);
-    SETERRNO(EBADF,VMS_SS_IVCHAN);
+    SETERRNO(EBADF,SS$_IVCHAN);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_sock_func, "listen");
@@ -2493,7 +2493,7 @@ PP(pp_accept)
 nuts:
     if (ckWARN(WARN_CLOSED))
 	report_evil_fh(ggv, ggv ? GvIO(ggv) : 0, PL_op->op_type);
-    SETERRNO(EBADF,VMS_SS_IVCHAN);
+    SETERRNO(EBADF,SS$_IVCHAN);
 
 badexit:
     RETPUSHUNDEF;
@@ -2520,7 +2520,7 @@ PP(pp_shutdown)
 nuts:
     if (ckWARN(WARN_CLOSED))
 	report_evil_fh(gv, io, PL_op->op_type);
-    SETERRNO(EBADF,VMS_SS_IVCHAN);
+    SETERRNO(EBADF,SS$_IVCHAN);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_sock_func, "shutdown");
@@ -2599,7 +2599,7 @@ PP(pp_ssockopt)
 nuts:
     if (ckWARN(WARN_CLOSED))
 	report_evil_fh(gv, io, optype);
-    SETERRNO(EBADF,VMS_SS_IVCHAN);
+    SETERRNO(EBADF,SS$_IVCHAN);
 nuts2:
     RETPUSHUNDEF;
 
@@ -2672,7 +2672,7 @@ PP(pp_getpeername)
 nuts:
     if (ckWARN(WARN_CLOSED))
 	report_evil_fh(gv, io, optype);
-    SETERRNO(EBADF,VMS_SS_IVCHAN);
+    SETERRNO(EBADF,SS$_IVCHAN);
 nuts2:
     RETPUSHUNDEF;
 
@@ -3275,7 +3275,7 @@ PP(pp_fttext)
 		gv = cGVOP_gv;
 		report_evil_fh(gv, GvIO(gv), PL_op->op_type);
 	    }
-	    SETERRNO(EBADF,VMS_RMS_IFI);
+	    SETERRNO(EBADF,RMS$_IFI);
 	    RETPUSHUNDEF;
 	}
     }
@@ -3721,7 +3721,7 @@ PP(pp_open_dir)
     RETPUSHYES;
 nope:
     if (!errno)
-        SETERRNO(EBADF,VMS_RMS_DIR);
+	SETERRNO(EBADF,RMS$_DIR);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_dir_func, "opendir");
@@ -3776,7 +3776,7 @@ PP(pp_readdir)
 
 nope:
     if (!errno)
-	SETERRNO(EBADF,VMS_RMS_ISI);
+	SETERRNO(EBADF,RMS$_ISI);
     if (GIMME == G_ARRAY)
 	RETURN;
     else
@@ -3807,7 +3807,7 @@ PP(pp_telldir)
     RETURN;
 nope:
     if (!errno)
-	SETERRNO(EBADF,VMS_RMS_ISI);
+	SETERRNO(EBADF,RMS$_ISI);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_dir_func, "telldir");
@@ -3830,7 +3830,7 @@ PP(pp_seekdir)
     RETPUSHYES;
 nope:
     if (!errno)
-	SETERRNO(EBADF,VMS_RMS_ISI);
+	SETERRNO(EBADF,RMS$_ISI);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_dir_func, "seekdir");
@@ -3851,7 +3851,7 @@ PP(pp_rewinddir)
     RETPUSHYES;
 nope:
     if (!errno)
-	SETERRNO(EBADF,VMS_RMS_ISI);
+	SETERRNO(EBADF,RMS$_ISI);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_dir_func, "rewinddir");
@@ -3881,7 +3881,7 @@ PP(pp_closedir)
     RETPUSHYES;
 nope:
     if (!errno)
-	SETERRNO(EBADF,VMS_RMS_IFI);
+	SETERRNO(EBADF,RMS$_IFI);
     RETPUSHUNDEF;
 #else
     DIE(aTHX_ PL_no_dir_func, "closedir");
diff --git a/toke.c b/toke.c
index ce049c9c58..af117bcf92 100644
--- a/toke.c
+++ b/toke.c
@@ -1935,7 +1935,7 @@ S_incl_perldb(pTHX)
 
 	if (pdb)
 	    return pdb;
-	SETERRNO(0,VMS_SS_NORMAL);
+	SETERRNO(0,SS$_NORMAL);
 	return "BEGIN { require 'perl5db.pl' }";
     }
     return "";