From e8f8336b79b62800bf47de9688f48694e6046e49 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sun, 24 Aug 2014 23:41:07 +0000
Subject: Release 10.67.03

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2259 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 lib/libsystem.c | 8 +++++++-
 lib/ppm.h       | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/libsystem.c b/lib/libsystem.c
index 48c6f06d..d21d0403 100644
--- a/lib/libsystem.c
+++ b/lib/libsystem.c
@@ -231,7 +231,9 @@ signalName(unsigned int const signalClass) {
    it would take to do it right.
 
    OpenBSD does not have SIGWINCH and SIGIO in 2013.  Everyone else seems
-   to have it.
+   to have them.  OpenBSD does have them if the code is not declared as
+   X/open code (i.e. OpenBSD seems to interpret _XOPEN_SOURCE backward -
+   it removes features rather than adds them).
 */
     switch (signalClass) {
     case SIGHUP: /* POSIX.1 */
@@ -276,8 +278,11 @@ signalName(unsigned int const signalClass) {
         return "SIGTTIN";
     case SIGTTOU: /* POSIX.1 */
         return "SIGTTOU";
+#ifdef SIGURG
+/* SCO Openserver 5.0.7/3.2 does not have SIGURG */
     case SIGURG:
         return "SIGURG";
+#endif
     case SIGXCPU:
         return "SIGXCPU";
     case SIGXFSZ:
@@ -291,6 +296,7 @@ signalName(unsigned int const signalClass) {
         return "SIGWINCH";
 #endif
 #ifdef SIGIO
+/* SCO Openserver 5.0.7/3.2 does not have SIGIO */
     case SIGIO:
         return "SIGIO";
 #endif
diff --git a/lib/ppm.h b/lib/ppm.h
index 76179724..7a24f926 100644
--- a/lib/ppm.h
+++ b/lib/ppm.h
@@ -250,13 +250,13 @@ struct hsv
 ppm_hsv_from_color(pixel  const color,
                    pixval const maxval);
 
-static __inline pixval
+static __inline__ pixval
 ppm_luminosity(pixel const p) {
 
     return (pixval)(PPM_LUMIN(p) + 0.5);
 }
 
-static __inline pixval
+static __inline__ pixval
 ppm_colorvalue(pixel const p) {
 /*----------------------------------------------------------------------------
   The color value (V is HSV) as a pixval
@@ -264,7 +264,7 @@ ppm_colorvalue(pixel const p) {
     return PPM_MAX(PPM_GETR(p), PPM_MAX(PPM_GETG(p), PPM_GETB(p)));
 }
 
-static __inline pixval
+static __inline__ pixval
 ppm_saturation(pixel const p,
                pixval const maxval) {
 /*----------------------------------------------------------------------------
-- 
cgit 1.4.1