OpenVMS update follow-up

sys/vms/vmsfiles.c

@@ -10,7 +10,7 @@
 #include "config.h"
 #include <ctype.h>
 
-#ifdef VMS9
+#ifdef VMSVSI
 #include <descrip.h>
 #include <lib$routines.h>
 #include <starlet.h>
@@ -34,7 +34,7 @@ int c__translate(int);
 #define C$$TRANSLATE(status) (errno = EVMSERR, vaxc$errno = (status))
 #endif
 
-#ifndef VMS9
+#ifndef VMSVSI
 extern unsigned long sys$parse(), sys$search(), sys$enter(), sys$remove();
 extern int VDECL(lib$match_cond, (int, int, ...));
 #endif

sys/vms/vmsmail.c

@@ -11,7 +11,7 @@ unsigned long enable_broadcast_trapping(void);
 unsigned long disable_broadcast_trapping(void);
 struct mail_info *parse_next_broadcast(void);
 
-#ifdef VMS9
+#ifdef VMSVSI
 #include <descrip.h>
 #include <lib$routines.h>
 #include <starlet.h>
@@ -46,7 +46,7 @@ extern size_t strspn(const char *, const char *);
 extern int VDECL(sscanf, (const char *, const char *, ...));
 #endif
 
-#ifdef VMS9
+#ifdef VMSVSI
 #include <smg$routines.h>
 #else
 extern unsigned long smg$create_pasteboard(), smg$get_broadcast_message(),

sys/vms/vmsmain.c

@@ -7,7 +7,7 @@
 #include "hack.h"
 #include "dlb.h"
 
-#ifdef VMS9
+#ifdef VMSVSI
 #include <descrip.h>
 #include <lib$routines.h>
 #include <starlet.h>
@@ -395,7 +395,7 @@ byebye(void)
     void (*hup)(int) ;
 #ifdef SHELL
     extern unsigned long dosh_pid, mail_pid;
-#ifndef VMS9
+#ifndef VMSVSI
     extern unsigned long sys$delprc(unsigned long *, const genericptr_t);
 #endif
 

sys/vms/vmsmisc.c

@@ -5,7 +5,7 @@
 #include "config.h"
 #undef exit
 
-#ifdef VMS9
+#ifdef VMSVSI
 #include <descrip.h>
 #include <lib$routines.h>
 #include <starlet.h>
@@ -21,7 +21,7 @@ ATTRNORETURN void vms_abort(void);
 
 /* first arg should be unsigned long but <lib$routines.h> has unsigned int */
 
-#ifndef VMS9
+#ifndef VMSVSI
 extern void VDECL(lib$signal, (unsigned, ...));
 #endif
 

sys/vms/vmstty.c

@@ -9,7 +9,7 @@
 #include "wintty.h"
 #include "tcap.h"
 
-#ifdef VMS9
+#ifdef VMSVSI
 #include <lib$routines.h>
 #include <smg$routines.h>
 #include <starlet.h>
@@ -40,12 +40,12 @@
 #include <signal.h>
 
 
-#ifndef VMS9
+#ifndef VMSVSI
 unsigned long lib$disable_ctrl(), lib$enable_ctrl();
 unsigned long sys$assign(), sys$dassgn(), sys$qiow();
 #endif
 #ifndef USE_QIO_INPUT
-#ifndef VMS9
+#ifndef VMSVSI
 unsigned long smg$create_virtual_keyboard(), smg$delete_virtual_keyboard(),
     smg$read_keystroke(), smg$cancel_input();
 #endif
@@ -533,7 +533,7 @@ introff(void)
 
 #ifdef TIMED_DELAY
 
-#ifndef VMS9
+#ifndef VMSVSI
 extern unsigned long lib$emul(const long *, const long *, const long *,
                               long *);
 extern unsigned long sys$schdwk(), sys$hiber();

sys/vms/vmsunix.c

@@ -7,7 +7,7 @@
 
 #include "hack.h"
 
-#ifdef VMS9
+#ifdef VMSVSI
 #include <lib$routines.h>
 #include <smg$routines.h>
 #include <starlet.h>
@@ -33,7 +33,7 @@
 
 extern int debuggable; /* defined in vmsmisc.c */
 
-#ifndef VMS9
+#ifndef VMSVSI
 extern void VDECL(lib$signal, (unsigned, ...));
 extern unsigned long sys$setprv();
 extern unsigned long lib$getdvi(), lib$getjpi(), lib$spawn(), lib$attach();
@@ -228,7 +228,7 @@ vms_define(const char *name, const char *value, int flag)
     static struct itm3 itm_lst[] = { { 0, LNM$_STRING, 0, 0 }, { 0, 0 } };
     struct dsc nam_dsc, val_dsc, tbl_dsc;
     unsigned long result;
-#ifndef VMS9
+#ifndef VMSVSI
     unsigned long sys$crelnm(), lib$set_logical();
 #endif
 
@@ -596,7 +596,7 @@ struct dsc {
 };                             /* descriptor */
 typedef unsigned long vmscond; /* vms condition value */
 
-#ifndef VMS9
+#ifndef VMSVSI
 vmscond lib$find_file(const struct dsc *, struct dsc *, genericptr *);
 vmscond lib$find_file_end(void **);
 #endif