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)

diff --git a/src/feature.h b/src/feature.h
index 0c68f79f2a631cc867024ca57951250aae37ae9c..028eebcc72bcdbf8c37c8d099e3752e8c2d467e0 100644 (file)
--- 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 f7c1f45114d9ed3b22f3be6ee1c1d457cd54c489..e59297f6eecae036fb927ff42941ad821e5eef90 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2047,
 /**/
     2046,
 /**/