From 0d022946bc0dea99b1da7e923edd5627b4e11d75 Mon Sep 17 00:00:00 2001
From: Ryan Bloom <rbb@apache.org>
Date: Mon, 13 Dec 1999 20:52:28 +0000
Subject: [PATCH] Get rid of more platform dependant code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84288 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/filters/mod_include.c     | 10 +---------
 modules/generators/mod_cgi.c      | 11 ++---------
 modules/metadata/mod_mime_magic.c | 11 +----------
 server/log.c                      | 10 +---------
 4 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index df3dfd6b66..05f73fd3b5 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -816,7 +816,6 @@ static int include_cmd(char *s, request_rec *r)
     ap_status_t rc;
     ap_table_t *env = r->subprocess_env;
     char **argv;
-    ap_os_proc_t pid;
     ap_file_t *file;
     ap_iol *iol;
 
@@ -870,14 +869,7 @@ static int include_cmd(char *s, request_rec *r)
                         "couldn't create child process: %d: %s", rc, r->filename);
         }
         else {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redone
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&pid, procnew);
-            ap_note_subprocess(r->pool, pid, kill_after_timeout);
-#endif
+            ap_note_subprocess(r->pool, procnew, kill_after_timeout);
             /* Fill in BUFF structure for parents pipe to child's stdout */
             ap_get_childout(&file, procnew);
             iol = ap_create_file_iol(file);
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index b0debe113d..c0ee8aa7f6 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -284,7 +284,6 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
     char **env;
     ap_procattr_t *procattr;
     ap_proc_t *procnew;
-    ap_os_proc_t fred;
     ap_status_t rc = APR_SUCCESS;
     ap_file_t *file;
     ap_iol *iol;
@@ -340,14 +339,8 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
                         "couldn't create child process: %d: %s", rc, r->filename);
         }
         else {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redone
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&fred, procnew);
-            ap_note_subprocess(p, fred, kill_after_timeout);
-#endif
+            ap_note_subprocess(p, procnew, kill_after_timeout);
+
             /* Fill in BUFF structure for parents pipe to child's stdout */
             ap_get_childout(&file, procnew);
             iol = ap_create_file_iol(file);
diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 30f0743e84..ee553d7a68 100644
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2153,7 +2153,6 @@ static int uncompress_child(struct uncompress_parms *parm, ap_context_t *cntxt,
     ap_context_t *child_context = cntxt;
     ap_procattr_t *procattr;
     ap_proc_t *procnew = NULL;
-    ap_os_proc_t fred;
     ap_file_t *file;
     ap_iol *iol;
 
@@ -2190,15 +2189,7 @@ static int uncompress_child(struct uncompress_parms *parm, ap_context_t *cntxt,
                           compr[parm->method].argv[0]);
         }
         else {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redon
-
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&fred, procnew);
-            ap_note_subprocess(child_context, fred, kill_after_timeout);
-#endif
+            ap_note_subprocess(child_context, procnew, kill_after_timeout);
             /* Fill in BUFF structure for parents pipe to child's stdout */
             ap_get_childout(&file, procnew);
             iol = ap_create_file_iol(file);
diff --git a/server/log.c b/server/log.c
index 7bb695ac82..0180fb0bcf 100644
--- a/server/log.c
+++ b/server/log.c
@@ -166,7 +166,6 @@ static int log_child(ap_context_t *p, const char *progname,
     int rc = -1;
     ap_procattr_t *procattr;
     ap_proc_t *procnew;
-    ap_os_proc_t fred;
 
     ap_block_alarms();
     ap_cleanup_for_exec();
@@ -189,14 +188,7 @@ static int log_child(ap_context_t *p, const char *progname,
         rc = ap_create_process(&procnew, progname, NULL, NULL, procattr, p);
     
         if (rc == APR_SUCCESS) {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redone
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&fred, procnew);
-            ap_note_subprocess(p, fred, kill_after_timeout);
-#endif
+            ap_note_subprocess(p, procnew, kill_after_timeout);
             ap_get_childin(fpin, procnew);
         }
     }
-- 
2.50.1