Have __APPLE2ENH__ imply __APPLE2__ and __ATARIXL__ imply __ATARI__.

This commit is contained in:
Oliver Schmidt
2013-06-17 21:34:08 +02:00
parent 92ad74a49f
commit 83280e1ee2
16 changed files with 30 additions and 26 deletions

View File

@@ -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[] */

View File

@@ -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

View File

@@ -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>

View File

@@ -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 */

View File

@@ -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)

View File

@@ -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()