From 83280e1ee2155eb1f08faba22ac320d417110094 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Mon, 17 Jun 2013 21:34:08 +0200
Subject: [PATCH] Have __APPLE2ENH__ imply __APPLE2__ and __ATARIXL__ imply
 __ATARI__.

---
 asminc/stdio.inc        | 4 ++--
 include/apple2.h        | 4 ++--
 include/atari.h         | 2 +-
 include/conio.h         | 8 ++++----
 include/dirent.h        | 4 ++--
 include/stdio.h         | 4 ++--
 include/time.h          | 2 +-
 libsrc/dbg/dbg.c        | 4 ++--
 samples/mandelbrot.c    | 2 +-
 samples/sieve.c         | 2 +-
 src/ca65/main.c         | 2 ++
 src/cc65/main.c         | 2 ++
 testcode/lib/em-test.c  | 4 ++--
 testcode/lib/ft.c       | 4 ++--
 testcode/lib/mul-test.c | 4 ++--
 testcode/lib/ser-test.c | 4 ++--
 16 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/asminc/stdio.inc b/asminc/stdio.inc
index 835a204b1..18a7541e0 100644
--- a/asminc/stdio.inc
+++ b/asminc/stdio.inc
@@ -41,9 +41,9 @@ _IOLBF          = 1
 _IONBF          = 2
 BUFSIZ          = 256
 EOF             = -1
-.if .defined(__APPLE2__) .or .defined(__APPLE2ENH__)
+.if .defined(__APPLE2__)
 FILENAME_MAX    = 64+1
-.elseif .defined(__ATARI__) .or .defined(__ATARIXL__)
+.elseif .defined(__ATARI__)
 FILENAME_MAX    = 12+1
 .elseif .defined(__LUNIX__)
 FILENAME_MAX    = 80+1
diff --git a/include/apple2.h b/include/apple2.h
index 177159e46..190248b0d 100644
--- a/include/apple2.h
+++ b/include/apple2.h
@@ -37,7 +37,7 @@
 
 
 /* Check for errors */
-#if !defined(__APPLE2__) && !defined(__APPLE2ENH__)
+#if !defined(__APPLE2__)
 #  error This module may only be used when compiling for the Apple ][!
 #endif
 
@@ -142,7 +142,7 @@ extern unsigned char _filetype;  /* Default 6 */
 extern unsigned int  _auxtype;   /* Default 0 */
 
 /* The addresses of the static drivers */
-#ifndef __APPLE2ENH__
+#if !defined(__APPLE2ENH__)
 extern void a2_auxmem_emd[];
 extern void a2_stdjoy_joy[];     /* Referred to by joy_static_stddrv[]   */
 extern void a2_stdmou_mou[];     /* Referred to by mouse_static_stddrv[] */
diff --git a/include/atari.h b/include/atari.h
index ca1f9299c..e47d1ccea 100644
--- a/include/atari.h
+++ b/include/atari.h
@@ -38,7 +38,7 @@
 
 
 /* Check for errors */
-#if !defined(__ATARI__) && !defined(__ATARIXL__)
+#if !defined(__ATARI__)
 #  error This module may only be used when compiling for the Atari!
 #endif
 
diff --git a/include/conio.h b/include/conio.h
index 693e40035..cd6bf3651 100644
--- a/include/conio.h
+++ b/include/conio.h
@@ -59,11 +59,11 @@
 #endif
 
 /* Include the correct machine-specific file */
-#if defined(__APPLE2__)
-#  include <apple2.h>
-#elif defined(__APPLE2ENH__)
+#if defined(__APPLE2ENH__)
 #  include <apple2enh.h>
-#elif defined(__ATARI__) || defined(__ATARIXL__)
+#elif defined(__APPLE2__)
+#  include <apple2.h>
+#elif defined(__ATARI__)
 #  include <atari.h>
 #elif defined(__ATMOS__)
 #  include <atmos.h>
diff --git a/include/dirent.h b/include/dirent.h
index d1d786419..b5e1be135 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -43,7 +43,7 @@
 
 typedef struct DIR DIR;
 
-#if defined(__APPLE2__) || defined(__APPLE2ENH__)
+#if defined(__APPLE2__)
 
 struct dirent {
     char          d_name[16];
@@ -78,7 +78,7 @@ struct dirent {
 #define _DE_ISLBL(t)  (0)
 #define _DE_ISLNK(t)  (0)
 
-#elif defined(__ATARI__) || defined(__ATARIXL__)
+#elif defined(__ATARI__)
 
 struct dirent {
     char          d_name[13];  /* 8.3 + trailing 0 */
diff --git a/include/stdio.h b/include/stdio.h
index b2c4fa67a..c2c735cb0 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -69,9 +69,9 @@ extern FILE* stderr;
 #define TMP_MAX         256
 
 /* Standard defines that are platform dependent */
-#if defined(__APPLE2__) || defined(__APPLE2ENH__)
+#if defined(__APPLE2__)
 #  define FILENAME_MAX  (64+1)
-#elif defined(__ATARI__) || defined(__ATARIXL__)
+#elif defined(__ATARI__)
 #  define FILENAME_MAX  (12+1)
 #elif defined(__LUNIX__)
 #  define FILENAME_MAX  (80+1)
diff --git a/include/time.h b/include/time.h
index 7ac69165b..507d7e29a 100644
--- a/include/time.h
+++ b/include/time.h
@@ -76,7 +76,7 @@ extern struct _timezone {
 
 
 
-#if defined(__ATARI__) || defined(__ATARIXL__)
+#if defined(__ATARI__)
 /* The clock depends on the video standard, so read it at runtime */
 unsigned _clocks_per_sec (void);
 #  define CLK_TCK               _clocks_per_sec()
diff --git a/libsrc/dbg/dbg.c b/libsrc/dbg/dbg.c
index 68453be6f..34c686e09 100644
--- a/libsrc/dbg/dbg.c
+++ b/libsrc/dbg/dbg.c
@@ -63,7 +63,7 @@ static char GetKeyUpdate (void);
 #    define COLOR_FRAMEHIGH     COLOR_WHITE
 #    define COLOR_FRAMELOW      COLOR_GRAY3
 #  else
-#    if defined(__APPLE2__) || defined(__APPLE2ENH__)
+#    if defined(__APPLE2__)
 #      define COLOR_BORDER      COLOR_BLACK
 #      define COLOR_BACKGROUND  COLOR_BLACK
 #      define COLOR_TEXTHIGH    COLOR_BLACK
@@ -93,7 +93,7 @@ static char GetKeyUpdate (void);
 #  define MAX_X         80
 #  define MAX_Y         25
 #  define DUMP_BYTES    16
-#elif defined(__APPLE2__) || defined(__APPLE2ENH__) || defined(__ATARI__) || defined(__ATARIXL__)
+#elif defined(__APPLE2__) || defined(__ATARI__)
 #  define MAX_X         40
 #  define MAX_Y         24
 #  define DUMP_BYTES     8
diff --git a/samples/mandelbrot.c b/samples/mandelbrot.c
index 6c58cea97..0ba4ebd2c 100644
--- a/samples/mandelbrot.c
+++ b/samples/mandelbrot.c
@@ -28,7 +28,7 @@
 #define divfp(_a,_b)    ((((signed long)_a)<<fpshift)/(_b))
 
 /* Workaround missing clock stuff */
-#if defined(__APPLE2__) || defined(__APPLE2ENH__)
+#ifdef __APPLE2__
 #  define clock()       0
 #  define CLK_TCK       1
 #endif
diff --git a/samples/sieve.c b/samples/sieve.c
index 9ecbab020..9d166b768 100644
--- a/samples/sieve.c
+++ b/samples/sieve.c
@@ -12,7 +12,7 @@
 
 
 /* Workaround missing clock stuff */
-#if defined(__APPLE2__) || defined(__APPLE2ENH__)
+#ifdef __APPLE2__
 #  define clock()               0
 #  define CLOCKS_PER_SEC        1
 #endif
diff --git a/src/ca65/main.c b/src/ca65/main.c
index 1f98e46ae..c862dcaad 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -209,6 +209,7 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_ATARIXL:
+            NewSymbol ("__ATARI__", 1);
             NewSymbol ("__ATARIXL__", 1);
             break;
 
@@ -253,6 +254,7 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_APPLE2ENH:
+            NewSymbol ("__APPLE2__", 1);
             NewSymbol ("__APPLE2ENH__", 1);
             break;
 
diff --git a/src/cc65/main.c b/src/cc65/main.c
index 6d9472143..cadad83d0 100644
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -165,6 +165,7 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_ATARIXL:
+            DefineNumericMacro ("__ATARI__", 1);
             DefineNumericMacro ("__ATARIXL__", 1);
             break;
 
@@ -209,6 +210,7 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_APPLE2ENH:
+            DefineNumericMacro ("__APPLE2__", 1);
             DefineNumericMacro ("__APPLE2ENH__", 1);
             break;
 
diff --git a/testcode/lib/em-test.c b/testcode/lib/em-test.c
index a6feed938..c7fee6a59 100644
--- a/testcode/lib/em-test.c
+++ b/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"
diff --git a/testcode/lib/ft.c b/testcode/lib/ft.c
index 586bace45..ff335240d 100644
--- a/testcode/lib/ft.c
+++ b/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");
diff --git a/testcode/lib/mul-test.c b/testcode/lib/mul-test.c
index 5df713072..5db42d4ab 100644
--- a/testcode/lib/mul-test.c
+++ b/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);
diff --git a/testcode/lib/ser-test.c b/testcode/lib/ser-test.c
index a3f92b633..c929189a3 100644
--- a/testcode/lib/ser-test.c
+++ b/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"
-- 
2.39.5