diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-15 12:54:18 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-15 12:54:18 +0100 |
| commit | 95f0b6e5a5e5861da34cc064c601faf4eeed4ed6 (patch) | |
| tree | e8b7414262ec23f9d5954f3008c936c8cf8c839a | |
| parent | 3e2d1c8cd61ca073e680f3b221ce887e05ba39cf (diff) | |
| download | vim-git-95f0b6e5a5e5861da34cc064c601faf4eeed4ed6.tar.gz | |
patch 8.2.0009: VMS: terminal version doesn't buildv8.2.0009
Problem: VMS: terminal version doesn't build.
Solution: Move MIN definition. Adjust #ifdefs. (Zoltan Arpadffy)
| -rw-r--r-- | src/bufwrite.c | 4 | ||||
| -rw-r--r-- | src/fileio.c | 5 | ||||
| -rw-r--r-- | src/ui.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/Make_vms.mms | 7 |
5 files changed, 12 insertions, 8 deletions
diff --git a/src/bufwrite.c b/src/bufwrite.c index 8393df1a0..f1895518b 100644 --- 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 6600b5920..e35ce8c7b 100644 --- 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. */ @@ -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 a45bb166c..8228595d0 100644 --- 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, diff --git a/src/xxd/Make_vms.mms b/src/xxd/Make_vms.mms index 872cd75f7..df6c1af24 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 @@ 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 |