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 8393df1..f189551 100644
--- a/src/bufwrite.c
+++ b/src/bufwrite.c
@@ -2080,6 +2080,10 @@
// 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 6600b59..e35ce8c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2866,11 +2866,6 @@
}
#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 6359571..f4f7bcf 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -247,7 +247,7 @@
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 a45bb16..8228595 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 9,
+/**/
8,
/**/
7,
diff --git a/src/xxd/Make_vms.mms b/src/xxd/Make_vms.mms
index 872cd75..df6c1af 100644
--- 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 @@
SOURCES = xxd.c
OBJ = xxd.obj
-.obj.c :
+.c.obj :
$(CC_DEF) $(CFLAGS) $<
$(TARGET) : $(OBJ)
@@ -67,3 +68,5 @@
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