From c367969d605b8af2e41e2d3ed08b5b1a25597412 Mon Sep 17 00:00:00 2001 From: keni Date: Mon, 18 Jan 2010 02:02:45 +0000 Subject: [PATCH] MacOS 9 vs MacOS 10 bit MAC is defined for MacOS 9 but not for 10 (and it shouldn't be). Add a MACOSX define and use it in eat.c to pick up the joke meant for all Mac systems. --- include/config1.h | 6 +++++- src/eat.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/config1.h b/include/config1.h index a74b09bf8..55da5ced3 100644 --- a/include/config1.h +++ b/include/config1.h @@ -33,7 +33,11 @@ /* * Mac Stuff. */ -#ifdef macintosh /* Auto-defined symbol for MPW compilers (sc and mrc) */ +#if defined(__APPLE__) && defined(__MACH__) +# define MACOSX +#endif + +#ifdef macintosh /* Auto-defined symbol for MPW compilers (sc and mrc) */ # define MAC #endif diff --git a/src/eat.c b/src/eat.c index 976e53925..3b07630f8 100644 --- a/src/eat.c +++ b/src/eat.c @@ -1768,7 +1768,7 @@ struct obj *otmp; } } else #endif -#ifdef MAC /* KMH -- Why should Unix have all the fun? */ +#if defined(MAC) || defined(MACOSX) /* KMH -- Why should Unix have all the fun? */ if (otmp->otyp == APPLE) { pline("Delicious! Must be a Macintosh!"); } else