Skip to content

Commit 95f0b6e

Browse files
committed
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)
1 parent 3e2d1c8 commit 95f0b6e

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

src/bufwrite.c

+4
Original file line numberDiff line numberDiff line change
@@ -2080,6 +2080,10 @@ buf_write(
20802080
// structures end with a newline (carriage return) character, and
20812081
// if they don't it adds one.
20822082
// With other RMS structures it works perfect without this fix.
2083+
# ifndef MIN
2084+
// Older DECC compiler for VAX doesn't define MIN()
2085+
# define MIN(a, b) ((a) < (b) ? (a) : (b))
2086+
# endif
20832087
if (buf->b_fab_rfm == FAB$C_VFC
20842088
|| ((buf->b_fab_rat & (FAB$M_FTN | FAB$M_CR)) != 0))
20852089
{

src/fileio.c

-5
Original file line numberDiff line numberDiff line change
@@ -2866,11 +2866,6 @@ check_for_cryptkey(
28662866
}
28672867
#endif // FEAT_CRYPT
28682868

2869-
#if defined(VMS) && !defined(MIN)
2870-
// Older DECC compiler for VAX doesn't define MIN()
2871-
# define MIN(a, b) ((a) < (b) ? (a) : (b))
2872-
#endif
2873-
28742869
/*
28752870
* Return TRUE if a file appears to be read-only from the file permissions.
28762871
*/

src/ui.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ ui_inchar(
247247
return retval;
248248
}
249249

250-
#if defined(UNIX) || defined(FEAT_GUI) || defined(PROTO)
250+
#if defined(UNIX) || defined(VMS) || defined(FEAT_GUI) || defined(PROTO)
251251
/*
252252
* Common code for mch_inchar() and gui_inchar(): Wait for a while or
253253
* indefinitely until characters are available, dealing with timers and

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
9,
745747
/**/
746748
8,
747749
/**/

src/xxd/Make_vms.mms

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
# or if you use mmk
1212
# mmk/descrip=Make_vms.mms
1313
#
14-
14+
# To cleanup: mms/descrip=Make_vms.mms clean
15+
#
1516
######################################################################
1617
# Configuration section.
1718
######################################################################
@@ -58,7 +59,7 @@ LDFLAGS =
5859
SOURCES = xxd.c
5960
OBJ = xxd.obj
6061

61-
.obj.c :
62+
.c.obj :
6263
$(CC_DEF) $(CFLAGS) $<
6364

6465
$(TARGET) : $(OBJ)
@@ -67,3 +68,5 @@ $(TARGET) : $(OBJ)
6768
clean :
6869
-@ if "''F$SEARCH("*.obj")'" .NES. "" then delete/noconfirm/nolog *.obj;*
6970
-@ if "''F$SEARCH("*.exe")'" .NES. "" then delete/noconfirm/nolog *.exe;*
71+
72+
xxd.obj : xxd.c

0 commit comments

Comments
 (0)