summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-25 15:45:38 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-25 15:45:38 +0100
commit36fe7b287e13a7534c9aa6dcf0c3d7f8363f6060 (patch)
treed9e5d748b43c7476ce9c651cda4c069ee87f4e95
parent5dc4e2f883896c99ebe83355822ac6067970b031 (diff)
patch 8.2.2047: Amiga: FEAT_ARP defined when it should notv8.2.2047
Problem: Amiga: FEAT_ARP defined when it should not. Solution: Adjust #ifdef. (Ola Söder, closes #7370)
-rw-r--r--src/feature.h4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/feature.h b/src/feature.h
index 0c68f79f2a..028eebcc72 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1089,11 +1089,11 @@
/*
* +ARP Amiga only. Use arp.library, DOS 2.0 is not required.
*/
-#if !defined(NO_ARP) && !defined(__amigaos4__)
+#if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
+ && !defined(__MORPHOS__) || !defined(__AROS__)
# define FEAT_ARP
#endif
-
/*
* +ole Win32 OLE automation: Use Makefile.ovc.
*/
diff --git a/src/version.c b/src/version.c
index f7c1f45114..e59297f6ee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2047,
+/**/
2046,
/**/
2045,