Have __APPLE2ENH__ imply __APPLE2__ and __ATARIXL__ imply __ATARI__.

testcode/lib/em-test.c

@@ -16,10 +16,10 @@
 #define DRIVERNAME      "cbm510-ram.emd"
 #elif defined(__CBM610__)
 #define DRIVERNAME      "cbm610-ram.emd"
-#elif defined(__APPLE2__)
-#define DRIVERNAME      "a2.auxmem.emd"
 #elif defined(__APPLE2ENH__)
 #define DRIVERNAME      "a2e.auxmem.emd"
+#elif defined(__APPLE2__)
+#define DRIVERNAME      "a2.auxmem.emd"
 #else
 #define DRIVERNAME      "unknown"
 #error "Unknown target system"

testcode/lib/ft.c

@@ -25,7 +25,7 @@
 extern int getsp(void);  /* is provided in getsp.s */
 
 /* Atari's fd indirection table */
-#if defined(__ATARI__) || defined(__ATARIXL__)
+#ifdef __ATARI__
 extern char __fd_index[];
 struct fd_t {
   char usage;
@@ -74,7 +74,7 @@ int main(int argc,char **argv)
         return(0);
     }
     printf("open success -- handle = $%x, sp = %d\n",fd,csp);
-#if defined(__ATARI__) || defined(__ATARIXL__)
+#ifdef __ATARI__
     printf("fd_index:\n ");
     for (i=0; i<12; i++) printf("%02X ",__fd_index[i]);
     printf("\nfd_table:\n");

testcode/lib/mul-test.c

@@ -18,7 +18,7 @@ static const unsigned char small_bar[8] = {
     ' ', 0xa5, 0xb4, 0xb5, 0xa1, 0xb6, 0xaa, 0xa7
 };
 
-#elif defined(__ATARI__) || defined(__ATARIXL__)
+#elif defined(__ATARI__)
 #endif
 
 /* Screen co-ordinates for the progress meter */
@@ -39,7 +39,7 @@ static void ProgressMeter (unsigned Val)
     revers (revers_bar[Val]);
     cputc (small_bar[Val]);
 
-#elif defined(__ATARI__) || defined(__ATARIXL__)
+#elif defined(__ATARI__)
 #endif
 
     revers (0);

testcode/lib/ser-test.c

@@ -13,10 +13,10 @@
 #define DRIVERNAME      "plus4-stdser.ser"
 #elif defined(__CBM610__)
 #define DRIVERNAME      "cbm610-std.ser"
-#elif defined(__APPLE2__)
-#define DRIVERNAME      "a2.ssc.ser"
 #elif defined(__APPLE2ENH__)
 #define DRIVERNAME      "a2e.ssc.ser"
+#elif defined(__APPLE2__)
+#define DRIVERNAME      "a2.ssc.ser"
 #else
 #define DRIVERNAME      "unknown"
 #error "Unknown target system"