From cb8dc85cfb7155a62258d525543752bfea08f8b5 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Sat, 31 May 2008 08:38:56 +0000
Subject: [PATCH] pid and wait() processing under solaris

---
 ChangeLog             | 3 +++
 src/frontend/aspice.c | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d64769fa..0e1114f24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-05-31 Dietmar Warning
+ * src/frontend/aspice.c: compliant processing of pid and wait() also under solaris
+
 2008-05-24 Holger Vogt
  * src/frontend/com_fft.c: Fast fourier transform added for transient data analysis.
  * src/frontend/spec.c: Progress status display for Windows added
diff --git a/src/frontend/aspice.c b/src/frontend/aspice.c
index 2cbdf34f5..6f38bc220 100644
--- a/src/frontend/aspice.c
+++ b/src/frontend/aspice.c
@@ -177,9 +177,9 @@ sigchild(void)
  * whether the exit was normal or not.
  */
 
-#if defined(__NetBSD__) || defined(SOLARIS)
+#if defined(__NetBSD__)
     pid_t status;
-#elif defined(__FreeBSD__) || defined(__APPLE__)
+#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(SOLARIS)
     int status;    
 #else
     union wait status;
@@ -193,7 +193,7 @@ ft_checkkids(void)
     struct proc *p = NULL, *lp = NULL;
     char buf[BSIZE_SP];
     FILE *fp;
-    int pid = 0;
+    pid_t pid = 0;
     static bool here = FALSE;   /* Don't want to be re-entrant. */
 
     if (!numchanged || here)
@@ -220,7 +220,7 @@ ft_checkkids(void)
         if (p == NULL) {
             fprintf(cp_err,
             "ft_checkkids: Internal Error: Process %d not a job!\n",
-                    pid);
+                    (int) pid);
             here = FALSE;
             return;
         }