Merge branch 'NetHack-3.7' into paxed-lua-v2-merged

win/share/tilemap.c

@@ -54,7 +54,7 @@ struct conditionals {
 #ifndef CHARON /* not supported yet */
     { MON_GLYPH, PM_CROESUS, "Charon" },
 #endif
-#ifndef MAIL
+#ifndef MAIL_STRUCTURES
     { MON_GLYPH, PM_FAMINE, "mail daemon" },
 #endif
     /* commented out in monst.c at present */
@@ -69,7 +69,7 @@ struct conditionals {
 /* allow slime mold to look like slice of pizza, since we
  * don't know what a slime mold should look like when renamed anyway
  */
-#ifndef MAIL
+#ifndef MAIL_STRUCTURES
     { OBJ_GLYPH, SCR_STINKING_CLOUD + EXTRA_SCROLL_DESCR_COUNT,
       "stamped / mail" },
 #endif