mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
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)
This commit is contained in:
@@ -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))
|
||||
{
|
||||
|
@@ -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.
|
||||
*/
|
||||
|
2
src/ui.c
2
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
|
||||
|
@@ -742,6 +742,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
9,
|
||||
/**/
|
||||
8,
|
||||
/**/
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user