From 3346f4a32c756464fce40801c87fca3223d24df5 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Wed, 19 Dec 2012 12:45:03 -0800
Subject: [PATCH] Fix build on VMS (IA64)

---
 VAX/vax630_sysdev.c |  2 +-
 descrip.mms         | 16 ++++++++--------
 sim_disk.c          |  2 +-
 sim_serial.c        |  2 +-
 sim_sock.c          |  7 +++++++
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/VAX/vax630_sysdev.c b/VAX/vax630_sysdev.c
index f2df66d5..3aa3a0dd 100644
--- a/VAX/vax630_sysdev.c
+++ b/VAX/vax630_sysdev.c
@@ -645,7 +645,7 @@ return;
 struct reglink {                                        /* register linkage */
     uint32      low;                                    /* low addr */
     uint32      high;                                   /* high addr */
-    t_stat      (*read)(int32 pa);                      /* read routine */
+    int32       (*read)(int32 pa);                      /* read routine */
     void        (*write)(int32 pa, int32 val, int32 lnt); /* write routine */
     };
 
diff --git a/descrip.mms b/descrip.mms
index e86bcd7e..b61c3274 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -671,8 +671,8 @@ VAX630_SOURCE1 = $(VAX630_DIR)VAX_CPU.C,$(VAX630_DIR)VAX_CPU1.C,\
                  $(VAX630_DIR)VAX_FPA.C,$(VAX630_DIR)VAX_CIS.C,\
                  $(VAX630_DIR)VAX_OCTA.C,$(VAX630_DIR)VAX_CMODE.C,\
                  $(VAX630_DIR)VAX_MMU.C,$(VAX630_DIR)VAX_SYS.C,\
-                 $(VAX630_DIR)VAX_SYSCM.C,$(VAX630_DIR)VAX630_STDDEV.C,\
-                 $(VAX630_DIR)VAX630_MEM.C,$(VAX630_DIR)VAX630_SYSDEV.C,\
+                 $(VAX630_DIR)VAX_SYSCM.C,$(VAX630_DIR)VAX_WATCH.C,\
+                 $(VAX630_DIR)VAX630_STDDEV.C,$(VAX630_DIR)VAX630_SYSDEV.C,\
                  $(VAX630_DIR)VAX630_IO.C,$(VAX630_DIR)VAX630_SYSLIST.C
 VAX630_LIB2 = $(LIB_DIR)VAX630L2-$(ARCH).OLB
 VAX630_SOURCE2 = $(PDP11_DIR)PDP11_IO_LIB.C,\
@@ -699,9 +699,9 @@ VAX620_SOURCE1 = $(VAX620_DIR)VAX_CPU.C,$(VAX620_DIR)VAX_CPU1.C,\
                  $(VAX620_DIR)VAX_FPA.C,$(VAX620_DIR)VAX_CIS.C,\
                  $(VAX620_DIR)VAX_OCTA.C,$(VAX620_DIR)VAX_CMODE.C,\
                  $(VAX620_DIR)VAX_MMU.C,$(VAX620_DIR)VAX_SYS.C,\
-                 $(VAX620_DIR)VAX_SYSCM.C,$(VAX620_DIR)VAX620_STDDEV.C,\
-                 $(VAX620_DIR)VAX620_MEM.C,$(VAX620_DIR)VAX620_SYSDEV.C,\
-                 $(VAX620_DIR)VAX620_IO.C,$(VAX620_DIR)VAX620_SYSLIST.C
+                 $(VAX620_DIR)VAX_SYSCM.C,$(VAX630_DIR)VAX_WATCH.C,\
+                 $(VAX620_DIR)VAX630_STDDEV.C,$(VAX620_DIR)VAX630_SYSDEV.C,\
+                 $(VAX620_DIR)VAX630_IO.C,$(VAX620_DIR)VAX630_SYSLIST.C
 VAX620_LIB2 = $(LIB_DIR)VAX620L2-$(ARCH).OLB
 VAX620_SOURCE2 = $(PDP11_DIR)PDP11_IO_LIB.C,\
                  $(PDP11_DIR)PDP11_RL.C,$(PDP11_DIR)PDP11_RQ.C,\
@@ -1290,11 +1290,11 @@ $(VAX630_LIB1) : $(VAX630_SOURCE1)
         $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
 
-$(VAX620_LIB2) : $(VAX620_SOURCE2)
+$(VAX630_LIB2) : $(VAX630_SOURCE2)
         $!
-        $! Building The $(VAX620_LIB2) Library.
+        $! Building The $(VAX630_LIB2) Library.
         $!
-        $ $(CC)$(VAX620_OPTIONS)/OBJ=$(VAX620_DIR) -
+        $ $(CC)$(VAX630_OPTIONS)/OBJ=$(VAX630_DIR) -
                /OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST)
         $ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN -
              LIBRARY/CREATE $(MMS$TARGET)
diff --git a/sim_disk.c b/sim_disk.c
index d46ea99c..799b2cd1 100644
--- a/sim_disk.c
+++ b/sim_disk.c
@@ -3043,7 +3043,7 @@ errno = Status;
 return hVHD;
 }
 
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(VMS)
 #include <unistd.h>
 #endif
 static void
diff --git a/sim_serial.c b/sim_serial.c
index a5d91558..1bba576f 100644
--- a/sim_serial.c
+++ b/sim_serial.c
@@ -1375,7 +1375,7 @@ for (ports=0; (ports < max); ++ports) {
                 device.dsc$w_length = devnamlen;
                 if ((0 == (devsts & UCB$M_TEMPLATE)) &&
                     (0 != (devsts & UCB$M_ONLINE)) &&
-                    (0 == (devdepend & DEV$M_RTM)) {
+                    (0 == (devdepend & DEV$M_RTM))) {
                     devstr[device.dsc$w_length] = '\0';
                     strcpy (list[ports].name, devstr);
                     while (list[ports].name[0] == '_')
diff --git a/sim_sock.c b/sim_sock.c
index f2648616..0b976672 100644
--- a/sim_sock.c
+++ b/sim_sock.c
@@ -143,6 +143,13 @@ typedef int     (WSAAPI *getaddrinfo_func) (const char *hostname,
                                  struct addrinfo **res);
 static getaddrinfo_func p_getaddrinfo;
 
+#if defined(VMS)
+typedef size_t socklen_t;
+#if !defined(EAI_OVERFLOW)
+#define EAI_OVERFLOW EAI_FAIL
+#endif
+#endif
+
 typedef int (WSAAPI *getnameinfo_func) (const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
 static getnameinfo_func p_getnameinfo;