patch 8.2.0009: VMS: terminal version doesn't build

Problem:    VMS: terminal version doesn't build.
Solution:   Move MIN definition.  Adjust #ifdefs. (Zoltan Arpadffy)

diff --git a/src/bufwrite.c b/src/bufwrite.c
index 8393df1a0c52e0d9a7e1fb4b944efd3c35837a1e..f1895518b39f456f0c9917f804664d3864878f9c 100644 (file)
--- a/src/bufwrite.c
+++ b/src/bufwrite.c
@@ -2080,6 +2080,10 @@ restore_backup:
            // structures end with a newline (carriage return) character, and
            // if they don't it adds one.
            // With other RMS structures it works perfect without this fix.
+# ifndef MIN
+// Older DECC compiler for VAX doesn't define MIN()
+#  define MIN(a, b) ((a) < (b) ? (a) : (b))
+# endif
            if (buf->b_fab_rfm == FAB$C_VFC
                    || ((buf->b_fab_rat & (FAB$M_FTN | FAB$M_CR)) != 0))
            {

diff --git a/src/fileio.c b/src/fileio.c
index 6600b5920c810a076a8e6768137097d3cdf70ebe..e35ce8c7b2facb94b46a466b5e9dab4a031727e1 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2866,11 +2866,6 @@ check_for_cryptkey(
 }
 #endif  // FEAT_CRYPT
 
-#if defined(VMS) && !defined(MIN)
-// Older DECC compiler for VAX doesn't define MIN()
-# define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 /*
  * Return TRUE if a file appears to be read-only from the file permissions.
  */

diff --git a/src/ui.c b/src/ui.c
index 635957107c0958f1c2e289303badd749bb051add..f4f7bcf8376a093e65e47a99ce21eda0b1092852 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -247,7 +247,7 @@ theend:
     return retval;
 }
 
-#if defined(UNIX) || defined(FEAT_GUI) || defined(PROTO)
+#if defined(UNIX) || defined(VMS) || defined(FEAT_GUI) || defined(PROTO)
 /*
  * Common code for mch_inchar() and gui_inchar(): Wait for a while or
  * indefinitely until characters are available, dealing with timers and

diff --git a/src/version.c b/src/version.c
index a45bb166c4951e5a5bce0e49f8b5742f8924cb5b..8228595d07838e9756b6ef833acfbb67245a7efd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    9,
 /**/
     8,
 /**/

diff --git a/src/xxd/Make_vms.mms b/src/xxd/Make_vms.mms
index 872cd75f723e1d61e4804e5ccb75f24294b62d26..df6c1af24800b046210032df808872f7f69958ed 100644 (file)
--- a/src/xxd/Make_vms.mms
+++ b/src/xxd/Make_vms.mms
@@ -11,7 +11,8 @@
 #        or if you use mmk
 #      mmk/descrip=Make_vms.mms
 #
-
+# To cleanup: mms/descrip=Make_vms.mms clean 
+#
 ######################################################################
 # Configuration section.
 ######################################################################
@@ -58,7 +59,7 @@ LDFLAGS =
 SOURCES        = xxd.c
 OBJ     = xxd.obj
 
-.obj.c :
+.c.obj :
        $(CC_DEF) $(CFLAGS) $<
 
 $(TARGET) : $(OBJ)
@@ -67,3 +68,5 @@ $(TARGET) : $(OBJ)
 clean :
        -@ if "''F$SEARCH("*.obj")'" .NES. ""  then delete/noconfirm/nolog *.obj;*
        -@ if "''F$SEARCH("*.exe")'" .NES. ""  then delete/noconfirm/nolog *.exe;*
+
+xxd.obj : xxd.c