patch 8.2.2054: Amiga: FEAT_ARP defined when it should not

Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust "||" to "&&" in #ifdef. (Ola Söder, closes #7375)

diff --git a/src/feature.h b/src/feature.h
index 028eebcc72bcdbf8c37c8d099e3752e8c2d467e0..8f7322bef1a7aa4dc341f627dd5b68bb1897793e 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -1090,7 +1090,7 @@
  * +ARP                        Amiga only. Use arp.library, DOS 2.0 is not required.
  */
 #if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
-       && !defined(__MORPHOS__) || !defined(__AROS__)
+       && !defined(__MORPHOS__) && !defined(__AROS__)
 # define FEAT_ARP
 #endif
 

diff --git a/src/version.c b/src/version.c
index bd8abac7a0102bab0a47f6ef3c331fde380b36df..7b7bea9ee2aca0cdabff1852d9dd698f0aa08bb3 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 */
+/**/
+    2054,
 /**/
     2053,
 /**/