From: Jim Jagielski <jim@apache.org>
Date: Mon, 23 Jul 2012 12:24:41 +0000 (+0000)
Subject: Merge r1363035 from trunk:
X-Git-Tag: 2.4.3~211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf3239d2ed699790ffaed0298798de7c68ceda4a;p=apache

Merge r1363035 from trunk:

avoid decls for some Unix-specific functions on Win32 too

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364608 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index aefbe7d9fa..8909c5cb8f 100644
--- a/STATUS
+++ b/STATUS
@@ -106,11 +106,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: trawick, rjung, jim
 
-   * Windows tweak to mpm_common.h to enable MinGW build
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1363035
-     2.4.x patch: trunk patch works
-     +1: trawick, rjung, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/include/mpm_common.h b/include/mpm_common.h
index 99b1945c96..0a98d7009e 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -89,7 +89,7 @@ extern "C" {
 typedef void ap_reclaim_callback_fn_t(int childnum, pid_t pid,
                                       ap_generation_t gen);
 
-#ifndef NETWARE
+#if (!defined(WIN32) && !defined(NETWARE)) || defined(DOXYGEN)
 /**
  * Make sure all child processes that have been spawned by the parent process
  * have died.  This includes process registered as "other_children".
@@ -164,7 +164,8 @@ AP_DECLARE(int) ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int
 
 AP_DECLARE(apr_status_t) ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf);
 AP_DECLARE(apr_status_t) ap_fatal_signal_child_setup(server_rec *s);
-#endif /* !NETWARE */
+
+#endif /* (!WIN32 && !NETWARE) || DOXYGEN */
 
 /**
  * Pool cleanup for end-generation hook implementation