Merge branch 'NetHack-3.7' into to500

win/curses/cursmain.c

@@ -122,7 +122,7 @@ struct window_procs curses_procs = {
     curses_delay_output,
 #ifdef CHANGE_COLOR
     curses_change_color,
-#ifdef MAC /* old OS 9, not OSX */
+#ifdef MACOS9 /* old OS 9, not OSX */
     (void (*)(int)) 0,
     (short (*)(winid, char *)) 0,
 #endif

win/share/tilemap.c

@@ -541,7 +541,7 @@ tilename(int set, const int file_entry, int gend UNUSED)
 #define SOURCE_TEMPLATE "NH:src/%s"
 #define INCLUDE_TEMPLATE "NH:include/t.%s"
 #else
-#ifdef MAC
+#ifdef MACOS9
 #define SOURCE_TEMPLATE ":src:%s"
 #define INCLUDE_TEMPLATE ":include:%s"
 #else

win/tty/getline.c

@@ -7,7 +7,7 @@
 
 #ifdef TTY_GRAPHICS
 
-#if !defined(MAC)
+#if !defined(MACOS9)
 #define NEWAUTOCOMP
 #endif
 

win/tty/wintty.c

@@ -20,7 +20,7 @@
 /* leave this undefined; it produces bad screen output with rxvt-unicode */
 /*#define DECgraphicsOptimization*/
 
-#ifdef MAC
+#ifdef MACOS9
 #define MICRO /* The Mac is a MICRO only for this file, not in general! */
 #ifdef THINK_C
 extern void msmsg(const char *, ...);
@@ -143,7 +143,7 @@ struct window_procs tty_procs = {
     tty_getlin, tty_get_ext_cmd, tty_number_pad, tty_delay_output,
 #ifdef CHANGE_COLOR /* the Mac uses a palette device */
     tty_change_color,
-#ifdef MAC
+#ifdef MACOS9
     tty_change_background, set_tty_font_name,
 #endif
     tty_get_color_string,