Fix the reporting for child processes that die. This removes

all of the non-portable W* macros from Apache.

Submitted by:	Jeff Trawick and Ryan Bloom


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62455 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 13 insertions, 13 deletions

diff --git a/test/testproc.c b/test/testproc.c
index 780ea0a09..d6f2e37cd 100644
--- a/test/testproc.c
+++ b/test/testproc.c
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
     else printf( "Read failed.\n");
 
     TEST_NEQ("Waiting for child to die",
-             apr_proc_wait(&newproc, NULL, APR_WAIT),
+             apr_proc_wait(&newproc, NULL, NULL, APR_WAIT),
              APR_CHILD_DONE, "OK", "Failed")   
     STD_TEST_NEQ("Removing directory", apr_dir_remove("proctest", pool))
 
diff --git a/test/testprocmutex.c b/test/testprocmutex.c
index bfe8739b8..92f62e2b3 100644
--- a/test/testprocmutex.c
+++ b/test/testprocmutex.c
@@ -126,10 +126,10 @@ static apr_status_t test_exclusive(const char *lockname)
     printf("OK\n");
  
     printf("%-60s", "    Waiting for processes to exit");
-    s1 = apr_proc_wait(p1, NULL, APR_WAIT);
-    s2 = apr_proc_wait(p2, NULL, APR_WAIT);
-    s3 = apr_proc_wait(p3, NULL, APR_WAIT);
-    s4 = apr_proc_wait(p4, NULL, APR_WAIT);
+    s1 = apr_proc_wait(p1, NULL, NULL, APR_WAIT);
+    s2 = apr_proc_wait(p2, NULL, NULL, APR_WAIT);
+    s3 = apr_proc_wait(p3, NULL, NULL, APR_WAIT);
+    s4 = apr_proc_wait(p4, NULL, NULL, APR_WAIT);
     printf("OK\n");
  
     if ((*x) != MAX_COUNTER) {
diff --git a/test/testsock.c b/test/testsock.c
index 2e8059268..d5b177a97 100644
--- a/test/testsock.c
+++ b/test/testsock.c
@@ -96,18 +96,18 @@ static int run_basic_test(apr_pool_t *context)
         exit(-1);
     }
 
-    while ((s1 = apr_proc_wait(&proc1, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE && 
-           (s2 = apr_proc_wait(&proc2, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
+    while ((s1 = apr_proc_wait(&proc1, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE && 
+           (s2 = apr_proc_wait(&proc2, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
         continue;
     }
 
     if (s1 == APR_SUCCESS) {
         apr_proc_kill(&proc2, SIGTERM);
-        while (apr_proc_wait(&proc2, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
+        while (apr_proc_wait(&proc2, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
     }
     else {
         apr_proc_kill(&proc1, SIGTERM);
-        while (apr_proc_wait(&proc1, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
+        while (apr_proc_wait(&proc1, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
     }
     fprintf(stdout, "Network test completed.\n");   
 
@@ -163,18 +163,18 @@ static int run_sendfile(apr_pool_t *context, int number)
         exit(-1);
     }
 
-    while ((s1 = apr_proc_wait(&proc1, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE && 
-           (s2 = apr_proc_wait(&proc2, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
+    while ((s1 = apr_proc_wait(&proc1, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE && 
+           (s2 = apr_proc_wait(&proc2, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
         continue;
     }
 
     if (s1 == APR_SUCCESS) {
         apr_proc_kill(&proc2, SIGTERM);
-        while (apr_proc_wait(&proc2, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
+        while (apr_proc_wait(&proc2, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
     }
     else {
         apr_proc_kill(&proc1, SIGTERM);
-        while (apr_proc_wait(&proc1, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
+        while (apr_proc_wait(&proc1, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
     }
     fprintf(stdout, "Network test completed.\n");