From c756663370537bf55f211c465a44e1f8d25b014e Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Wed, 29 Dec 2004 13:02:09 +0000
Subject: [PATCH] Updated signal names

---
 lib/mbselib.h |  2 --
 lib/signame.c | 29 ++++++-----------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/lib/mbselib.h b/lib/mbselib.h
index a5408a74..dbbaae22 100644
--- a/lib/mbselib.h
+++ b/lib/mbselib.h
@@ -2018,8 +2018,6 @@ struct _route {
 };
 
 
-extern char SigName[32][16];
-
 
 /*
  *  From clcomm.c
diff --git a/lib/signame.c b/lib/signame.c
index 05888379..03958256 100644
--- a/lib/signame.c
+++ b/lib/signame.c
@@ -36,7 +36,7 @@
  *  Signal handler signal names.
  */
 
-#ifdef __i386__
+#if defined(__i386__)
 
 char	SigName[32][16] = {	"NOSIGNAL",
 		"SIGHUP",	"SIGINT",	"SIGQUIT",	"SIGILL",
@@ -48,9 +48,7 @@ char	SigName[32][16] = {	"NOSIGNAL",
 		"SIGXFSZ",	"SIGVTALRM",	"SIGPROF",	"SIGWINCH",
 		"SIGIO",	"SIGPWR",	"SIGUNUSED"};
 
-#endif
-
-#ifdef __PPC__
+#elif defined(__PPC__)
 
 char    SigName[32][16] = {     "NOSIGNAL",
                 "SIGHUP",       "SIGINT",       "SIGQUIT",      "SIGILL",
@@ -62,9 +60,7 @@ char    SigName[32][16] = {     "NOSIGNAL",
                 "SIGXFSZ",      "SIGVTALRM",    "SIGPROF",      "SIGWINCH",
                 "SIGIO",        "SIGPWR",       "SIGUNUSED"};
 
-#endif
-
-#ifdef __sparc__
+#elif defined(__sparc__)
 
 char	SigName[32][16] = {	"NOSIGNAL",
 		"SIGHUP",	"SIGINT",	"SIGQUIT",	"SIGILL",
@@ -75,9 +71,8 @@ char	SigName[32][16] = {	"NOSIGNAL",
 		"SIGTTIN",	"SIGTTOU",	"SIGIO",	"SIGXCPU",
 		"SIGXFSZ",	"SIGVTALRM",	"SIGPROF",	"SIGWINCH",
 		"SIGLOST",	"SIGUSR1",	"SIGUSR2"};
-#endif
 
-#ifdef __alpha__
+#elif defined(__alpha__) || defined(__hppa__)
 
 char	SigName[32][16] = {	"NOSIGNAL",
 		"SIGHUP",       "SIGINT",       "SIGQUIT",      "SIGILL",
@@ -89,19 +84,7 @@ char	SigName[32][16] = {	"NOSIGNAL",
 		"SIGXFSZ",      "SIGVTALRM",    "SIGPROF",      "SIGWINCH",
 		"SIGINFO",      "SIGUSR1",      "SIGUSR2"};
 
-#endif
-
-#ifdef __hppa__
-
-char    SigName[32][16] = {     "NOSIGNAL",
-		"SIGHUP",       "SIGINT",       "SIGQUIT",      "SIGILL",
-		"SIGTRAP",      "SIGABRT",      "SIGEMT",       "SIGFPE",
-		"SIGKILL",      "SIGBUS",       "SIGSEGV",      "SIGSYS",
-		"SIGPIPE",      "SIGALRM",      "SIGTERM",      "SIGUSR1",
-		"SIGUSR2",      "SIGCHLD",      "SIGPWR",       "SIGVTALRM",
-		"SIGPROF",      "SIGIO",        "SIGWINCH",     "SIGSTOP",
-		"SIGTSTP",      "SIGCONT",      "SIGTTIN",      "SIGTTOU",
-		"SIGURG",       "SIGLOST",      "SIGUNUSED"};
-
+#else
+#error "Can't make signal names on this platform"
 #endif