Release 10.35.76

git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1263 9d0c8265-081b-0410-96cb-a4ca84ce46f8

4 files changed, 79 insertions, 73 deletions

diff --git a/Makefile.version b/Makefile.version
index ca1c436d..9111b3ab 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 75
+NETPBM_POINT_RELEASE = 76
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c
index ed074777..ce1fe4f6 100644
--- a/converter/other/pnmtopng.c
+++ b/converter/other/pnmtopng.c
@@ -2772,8 +2772,8 @@ displayVersion() {
     */
     fprintf(stderr, "   Compiled with libpng %s.\n",
             PNG_LIBPNG_VER_STRING);
-    fprintf(stderr, "   Compiled with zlib %s; using zlib %s.\n",
-            ZLIB_VERSION, zlib_version);
+    fprintf(stderr, "   Pnmtopng (not libpng) compiled with zlib %s.\n",
+            ZLIB_VERSION);
     fprintf(stderr, "\n");
 }
 
diff --git a/doc/HISTORY b/doc/HISTORY
index f2b3ae98..9dfde0f7 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,15 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+10.07.10 BJH  Release 10.35.76
+
+              Pnmtopng:  -libversion doesn't report level of linked libz.
+              It was a modularity violation and caused build failures on
+              Mac OS X, because Pnmtopng per se doesn't know about libz --
+              it's used by libpng.
+
+              Build: don't fail due to SIGRTMIN, SIGRTMAX being undefined.
+
 10.05.31 BJH  Release 10.35.75
 
               palmtopnm: fix for pixel size 16.  Thanks Paul Bolle
diff --git a/lib/libsystem.c b/lib/libsystem.c
index 6919bf2c..082ffdc0 100644
--- a/lib/libsystem.c
+++ b/lib/libsystem.c
@@ -158,77 +158,74 @@ spawnProcessor(const char * const shellCommand,
 static const char *
 signalName(unsigned int const signalClass) {
 
-    if (signalClass <= SIGSYS) {
-        switch (signalClass) {
-        case SIGHUP:
-            return "SIGHUP";
-        case SIGINT:
-            return "SIGINT";
-        case SIGQUIT:
-            return "SIGQUIT";
-        case SIGILL:
-            return "SIGILL";
-        case SIGTRAP:
-            return "SIGTRAP";
-        case SIGABRT:
-            return "SIGABRT";
-        case SIGBUS:
-            return "SIGBUS";
-        case SIGFPE:
-            return "SIGFPE";
-        case SIGKILL:
-            return "SIGKILL";
-        case SIGUSR1:
-            return "SIGUSR1";
-        case SIGSEGV:
-            return "SIGSEGV";
-        case SIGUSR2:
-            return "SIGUSR2";
-        case SIGPIPE:
-            return "SIGPIPE";
-        case SIGALRM:
-            return "SIGALRM";
-        case SIGTERM:
-            return "SIGTERM";
-        case SIGCHLD:
-            return "SIGCHLD";
-        case SIGCONT:
-            return "SIGCONT";
-        case SIGSTOP:
-            return "SIGSTOP";
-        case SIGTSTP:
-            return "SIGTSTP";
-        case SIGTTIN:
-            return "SIGTTIN";
-        case SIGTTOU:
-            return "SIGTTOU";
-        case SIGURG:
-            return "SIGURG";
-        case SIGXCPU:
-            return "SIGXCPU";
-        case SIGXFSZ:
-            return "SIGXFSZ";
-        case SIGVTALRM:
-            return "SIGVTALRM";
-        case SIGPROF:
-            return "SIGPROF";
-        case SIGWINCH:
-            return "SIGWINCH";
-        case SIGIO:
-            return "SIGIO";
-        case SIGSYS:
-            return "SIGSYS";
-        default:
-            return "???";
-
-            /* There are various other signal classes on some systems, but
-               not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO
-            */
-        }
-    } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX)
-        return "SIGRTxxx";
-    else
+    switch (signalClass) {
+    case SIGHUP: /* POSIX.1 */
+        return "SIGHUP";
+    case SIGINT: /* POSIX.1 */
+        return "SIGINT";
+    case SIGQUIT: /* POSIX.1 */
+        return "SIGQUIT";
+    case SIGILL: /* POSIX.1 */
+        return "SIGILL";
+    case SIGTRAP:
+        return "SIGTRAP";
+    case SIGABRT: /* POSIX.1 */
+        return "SIGABRT";
+    case SIGBUS:
+        return "SIGBUS";
+    case SIGFPE: /* POSIX.1 */
+        return "SIGFPE";
+    case SIGKILL: /* POSIX.1 */
+        return "SIGKILL";
+    case SIGUSR1: /* POSIX.1 */
+        return "SIGUSR1";
+    case SIGSEGV: /* POSIX.1 */
+        return "SIGSEGV";
+    case SIGUSR2: /* POSIX.1 */
+        return "SIGUSR2";
+    case SIGPIPE: /* POSIX.1 */
+        return "SIGPIPE";
+    case SIGALRM: /* POSIX.1 */
+        return "SIGALRM";
+    case SIGTERM: /* POSIX.1 */
+        return "SIGTERM";
+    case SIGCHLD: /* POSIX.1 */
+        return "SIGCHLD";
+    case SIGCONT: /* POSIX.1 */
+        return "SIGCONT";
+    case SIGSTOP: /* POSIX.1 */
+        return "SIGSTOP";
+    case SIGTSTP: /* POSIX.1 */
+        return "SIGTSTP";
+    case SIGTTIN: /* POSIX.1 */
+        return "SIGTTIN";
+    case SIGTTOU: /* POSIX.1 */
+        return "SIGTTOU";
+    case SIGURG:
+        return "SIGURG";
+    case SIGXCPU:
+        return "SIGXCPU";
+    case SIGXFSZ:
+        return "SIGXFSZ";
+    case SIGVTALRM:
+        return "SIGVTALRM";
+    case SIGPROF:
+        return "SIGPROF";
+    case SIGWINCH:
+        return "SIGWINCH";
+    case SIGIO:
+        return "SIGIO";
+    case SIGSYS:
+        return "SIGSYS";
+    default:
         return "???";
+
+        /* There are various other signal classes on some systems, but
+           not defined by POSIX and not on at least one system we
+           know of for which someone wanted to compile Netpbm.  The
+           list includes: SIGPWR, SIGLOST, SIGINFO, SIGRTxx.
+        */
+    }
 }