From 3af758ced542b6f7bc1973664bc82ef6c053079b Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Thu, 27 Jun 2013 23:09:54 +0200
Subject: [PATCH] Have __PLUS4__ imply __C16__.

---
 include/cbm264.h | 2 +-
 libsrc/dbg/dbg.c | 2 +-
 src/ca65/main.c  | 3 ++-
 src/cc65/main.c  | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/cbm264.h b/include/cbm264.h
index 9ede10f47..ff7468d30 100644
--- a/include/cbm264.h
+++ b/include/cbm264.h
@@ -39,7 +39,7 @@
 
 
 /* Check for errors */
-#if !defined(__PLUS4__) && !defined(__C16__)
+#if !defined(__C16__)
 #  error This module may only be used when compiling for the Plus/4 or C16!
 #endif
 
diff --git a/libsrc/dbg/dbg.c b/libsrc/dbg/dbg.c
index c0c2da971..00ff28722 100644
--- a/libsrc/dbg/dbg.c
+++ b/libsrc/dbg/dbg.c
@@ -47,7 +47,7 @@ static char GetKeyUpdate (void);
 
 
 /* Color definitions */
-#if defined(__PLUS4__) || defined(__C16__)
+#if defined(__C16__)
 #  define COLOR_BORDER          (BCOLOR_DARKBLUE | CATTR_LUMA6)
 #  define COLOR_BACKGROUND      COLOR_WHITE
 #  define COLOR_TEXTHIGH        COLOR_BLACK
diff --git a/src/ca65/main.c b/src/ca65/main.c
index c862dcaad..4b2f9d178 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -230,7 +230,8 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_PLUS4:
-            CBMSystem ("__PLUS4__");
+            CBMSystem ("__C16__");
+            NewSymbol ("__PLUS4__", 1);
             break;
 
         case TGT_CBM510:
diff --git a/src/cc65/main.c b/src/cc65/main.c
index cadad83d0..a27822ed8 100644
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -186,7 +186,8 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_PLUS4:
-            cbmsys ("__PLUS4__");
+            cbmsys ("__C16__");
+            DefineNumericMacro ("__PLUS4__", 1);
             break;
 
         case TGT_CBM510:
-- 
2.39.5