From: Adam Powers <apowers@ato.ms>
Date: Mon, 19 Oct 2020 20:21:07 +0000 (-0700)
Subject: fix NO_SIGNAL
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03e9eb6dd66c08a0f337e752f0e5887f942928be;p=nethack

fix NO_SIGNAL
---

diff --git a/src/files.c b/src/files.c
index f3c171111..dd7245861 100644
--- a/src/files.c
+++ b/src/files.c
@@ -630,10 +630,10 @@ clearlocks()
 #endif
 #ifndef NO_SIGNAL
     (void) signal(SIGINT, SIG_IGN);
-#endif
 #if defined(UNIX) || defined(VMS)
     sethanguphandler((void FDECL((*), (int) )) SIG_IGN);
 #endif
+#endif /* NO_SIGNAL */
     /* can't access maxledgerno() before dungeons are created -dlc */
     for (x = (g.n_dgns ? maxledgerno() : 0); x >= 0; x--)
         delete_levelfile(x); /* not all levels need be present */
diff --git a/src/save.c b/src/save.c
index c3864d5b0..a15ce5860 100644
--- a/src/save.c
+++ b/src/save.c
@@ -101,10 +101,10 @@ dosave0()
         return 0;
     fq_save = fqname(g.SAVEF, SAVEPREFIX, 1); /* level files take 0 */
 
+#ifndef NO_SIGNAL
 #if defined(UNIX) || defined(VMS)
     sethanguphandler((void FDECL((*), (int) )) SIG_IGN);
 #endif
-#ifndef NO_SIGNAL
     (void) signal(SIGINT, SIG_IGN);
 #endif
 
diff --git a/sys/libnh/libnhmain.c b/sys/libnh/libnhmain.c
index 2a11d4d25..844f385d0 100644
--- a/sys/libnh/libnhmain.c
+++ b/sys/libnh/libnhmain.c
@@ -555,11 +555,11 @@ whoami()
     return FALSE;
 }
 
+#ifndef NO_SIGNAL
 void
 sethanguphandler(handler)
 void FDECL((*handler), (int));
 {
-#ifndef NO_SIGNAL
 #ifdef SA_RESTART
     /* don't want reads to restart.  If SA_RESTART is defined, we know
      * sigaction exists and can be used to ensure reads won't restart.
@@ -581,8 +581,8 @@ void FDECL((*handler), (int));
     (void) signal(SIGXCPU, (SIG_RET_TYPE) handler);
 #endif
 #endif /* ?SA_RESTART */
-#endif /* !NO_SIGNAL */
 }
+#endif /* !NO_SIGNAL */
 
 #ifdef PORT_HELP
 void
@@ -1003,7 +1003,8 @@ void js_constants_init() {
     // copyright
     SET_CONSTANT_STRING("COPYRIGHT", COPYRIGHT_BANNER_A);
     SET_CONSTANT_STRING("COPYRIGHT", COPYRIGHT_BANNER_B);
-    SET_CONSTANT_STRING("COPYRIGHT", COPYRIGHT_BANNER_C);
+    // XXX: not set for cross-compile
+    //SET_CONSTANT_STRING("COPYRIGHT", COPYRIGHT_BANNER_C);
     SET_CONSTANT_STRING("COPYRIGHT", COPYRIGHT_BANNER_D);
 
     // glyphs