Minor fixes for the new apple2enh target

git-svn-id: svn://svn.cc65.org/cc65/trunk@2924 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/include/apple2enh.h b/include/apple2enh.h
index 914669874a92d9c4a36b5e327d9e60f275f7bc43..5185fd6938b1608c96211aa452526afa6a648840 100644 (file)
--- a/include/apple2enh.h
+++ b/include/apple2enh.h
@@ -44,7 +44,7 @@
 
 /* If not already done, include the apple2.h header file */
 #if !defined(_APPLE2_H)
-#  include <apple2enh.h>
+#  include <apple2.h>
 #endif
 
 

diff --git a/include/conio.h b/include/conio.h
index cb7037e9f3131860fdcf4a7e009cf0ef2645a0f2..48dc535c2e764b4244a2ed6f39d775e0478c491e 100644 (file)
--- a/include/conio.h
+++ b/include/conio.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2004 Ullrich von Bassewitz                                       */
+/*               Römerstraße 52                                              */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -61,6 +61,8 @@
 /* Include the correct machine specific file */
 #if defined(__APPLE2__) && !defined(_APPLE2_H)
 #  include <apple2.h>
+#elif defined(__APPLE2ENH__) && !defined(_APPLE2ENH_H)
+#  include <apple2enh.h>
 #elif defined(__ATARI__) && !defined(_ATARI_H)
 #  include <atari.h>
 #elif defined(__ATMOS__) && !defined(_ATMOS_H)
@@ -69,6 +71,8 @@
 #  include <cbm.h>
 #elif defined(__NES__) && !defined(_NES_H)
 #  include <nes.h>
+#else
+#  error "Unknown platform in conio.h"
 #endif