build fix for ck_server_admin_msg()

ck_server_admin_msg() is only available for '#if (UNIX && MAIL)' but
moveloop() tried to call it unconditionally.  Call if from the UNIX
edition of ckmailstatus() instead.

diff --git a/include/extern.h b/include/extern.h
index 537c58a06db4f06370992bf62b6fcb3cd1daa1d0..49ed2ec6afce752c043dae3143a6fb9f23445a68 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6 extern.h        $NHDT-Date: 1451174855 2015/12/27 00:07:35 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.526 $ */
+/* NetHack 3.6 extern.h        $NHDT-Date: 1451955077 2016/01/05 00:51:17 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.530 $ */
 /* Copyright (c) Steve Creps, 1988.                              */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1061,8 +1061,8 @@ E void FDECL(nocmov, (int x, int y));
 #ifdef MAIL
 #ifdef UNIX
 E void NDECL(getmailstatus);
-#endif
 E void NDECL(ck_server_admin_msg);
+#endif
 E void NDECL(ckmailstatus);
 E void FDECL(readmail, (struct obj *));
 #endif /* MAIL */

diff --git a/src/allmain.c b/src/allmain.c
index 9bc6bdcab832dfab688f5e738b48d23699077bd3..737dcf0d500ad6b61d154e00cb3f67e609bfd508 100644 (file)
--- a/src/allmain.c
+++ b/src/allmain.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 allmain.c       $NHDT-Date: 1451344214 2015/12/28 23:10:14 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.68 $ */
+/* NetHack 3.6 allmain.c       $NHDT-Date: 1451955079 2016/01/05 00:51:19 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.70 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -455,7 +455,6 @@ boolean resuming;
                 rhack(save_cm);
             }
         } else if (multi == 0) {
-            ck_server_admin_msg();
 #ifdef MAIL
             ckmailstatus();
 #endif

diff --git a/src/mail.c b/src/mail.c
index 552f263d458f1e74a2e8cbbce621fbd5c07e6801..7c35468351635824d14b2df76602656776019036 100644 (file)
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 mail.c  $NHDT-Date: 1450261364 2015/12/16 10:22:44 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.22 $ */
+/* NetHack 3.6 mail.c  $NHDT-Date: 1451955080 2016/01/05 00:51:20 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.25 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -470,6 +470,8 @@ struct obj *otmp UNUSED;
 void
 ckmailstatus()
 {
+    ck_server_admin_msg();
+
     if (!mailbox || u.uswallow || !flags.biff
 #ifdef MAILCKFREQ
         || moves < laststattime + MAILCKFREQ