Mercurial > vim

changeset 18896:4481f3b29fc5 v8.2.0009

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0009: VMS: terminal version doesn't build Commit: https://github.com/vim/vim/commit/95f0b6e5a5e5861da34cc064c601faf4eeed4ed6 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Dec 15 12:54:18 2019 +0100 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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 15 Dec 2019 13:00:04 +0100
parents c437c52fb34f
children e96a45cb70d2
files src/bufwrite.c src/fileio.c src/ui.c src/version.c src/xxd/Make_vms.mms
diffstat 5 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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))
 	    {
--- 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.
  */
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    9,
+/**/
     8,
 /**/
     7,
--- 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 @@ OBJ     = xxd.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