commit 36fe7b287e13a7534c9aa6dcf0c3d7f8363f6060
author Bram Moolenaar <Bram@vim.org> Wed Nov 25 15:45:38 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Nov 25 15:45:38 2020 +0100
tree d9e5d748b43c7476ce9c651cda4c069ee87f4e95
parent 5dc4e2f883896c99ebe83355822ac6067970b031

patch 8.2.2047: Amiga: FEAT_ARP defined when it should not

Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust #ifdef. (Ola Söder, closes #7370)

src/feature.h

diff --git a/src/feature.h b/src/feature.h
index 0c68f79..028eebc 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.
  */

src/version.c

diff --git a/src/version.c b/src/version.c
index f7c1f45..e59297f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2047,
+/**/
     2046,
 /**/
     2045,