Merge branch 'NetHack-3.7' into to500

include/config.h

@@ -36,7 +36,7 @@
 /* Hint: if you're not developing code, don't define
    ULTRIX_PROTO. */
 
-#include "config1.h" /* should auto-detect MSDOS, MAC, AMIGA, and WIN32 */
+#include "config1.h" /* should auto-detect MSDOS, MACOS9, AMIGA, and WIN32 */
 
 /*
  * Consolidated version, patchlevel, development status.
@@ -67,8 +67,8 @@
  *      tty, X11, mac, amii, BeOS, Qt, Gem, Gnome, shim
  */
 
-/* MAC also means MAC windows */
-#ifdef MAC
+/* MACOS9 also means MAC windows */
+#ifdef MACOS9
 #ifndef AUX
 #define DEFAULT_WINDOW_SYS "mac"
 #endif
@@ -339,7 +339,7 @@
 #define ENTRYMAX 100 /* must be >= 10 */
 #endif
 #ifndef PERS_IS_UID
-#if !defined(MICRO) && !defined(MAC) && !defined(WIN32)
+#if !defined(MICRO) && !defined(MACOS9) && !defined(WIN32)
 #define PERS_IS_UID 1 /* delete for PERSMAX per name; now per uid */
 #else
 #define PERS_IS_UID 0
@@ -434,7 +434,7 @@
  */
 #define INSURANCE /* allow crashed game recovery */
 
-#if !defined(MAC) && !defined(SHIM_GRAPHICS)
+#if !defined(MACOS9) && !defined(SHIM_GRAPHICS)
 #define CHDIR /* delete if no chdir() available */
 #endif
 
@@ -533,7 +533,7 @@ typedef unsigned char uchar;
 #define MACRO_CPATH /* use clear_path macros instead of functions */
 #endif
 
-#if !defined(MAC)
+#if !defined(MACOS9)
 #if !defined(NOCLIPPING)
 #define CLIPPING /* allow smaller screens -- ERS */
 #endif