Fix some MinGW build issues...

mpm_winnt.c:  MinGW doesn't currently define the Windows
              STACK_SIZE_PARAM_IS_A_RESERVATION symbol

mpm_unix.c:   Bypass all this code on Windows  (too much trouble
              to keep it out of Makefile)

mpm_common.h: Skip over definitions of functions not available on
              Windows to keep references out of exports.c.

PR: 49535
Submitted by: John Vandenberg <jayvdb gmail.com>
Minor tweaks by: trawick

Other commits for this PR: r1089950, r1089951, r1089954

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090614 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 534e1029864cf5f2c38ed779aab01c57df1a24a9..917523fe6df388c871663ecbaa3a2ccf1ba60296 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.12
 
+  *) MinGW build improvements.  PR 49535.  [John Vandenberg 
+     <jayvdb gmail.com>, Jeff Trawick]
+
   *) core: Support module names with colons in loglevel configuration.
      [Torsten Förtsch <torsten foertsch gmx net>]
 

diff --git a/include/mpm_common.h b/include/mpm_common.h
index c77d4664a5fbd42e83a858a194767f36937aa6f3..e6583bec1405ab3f71da80e796e69ef1a13110a1 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -212,6 +212,8 @@ AP_DECLARE(gid_t) ap_gname2id(const char *name);
 int initgroups(const char *name, gid_t basegid);
 #endif
 
+#if !defined(WIN32) || defined(DOXYGEN)
+
 typedef struct ap_pod_t ap_pod_t;
 
 struct ap_pod_t {
@@ -255,6 +257,8 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_signal(ap_pod_t *pod);
  */
 AP_DECLARE(void) ap_mpm_pod_killpg(ap_pod_t *pod, int num);
 
+#endif /* !WIN32 || DOXYGEN */
+
 /**
  * Check that exactly one MPM is loaded
  * Returns NULL if yes, error string if not.

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 038464bf6893b39017350f1d7c39899413b3c414..2556d80bb45e4153d8922d24ee5a6176dd28ffad 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -44,6 +44,10 @@
 #define _environ environ
 #endif
 
+#ifndef STACK_SIZE_PARAM_IS_A_RESERVATION /* missing on MinGW */
+#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000
+#endif
+
 /* scoreboard.c does the heavy lifting; all we do is create the child
  * score by moving a handle down the pipe into the child's stdin.
  */

diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index 32ad1f70a7df6d342fe92d15c49843c0435d53db..467070e598c2af76418382034b3dd28f769a2560 100644 (file)
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -25,6 +25,8 @@
  * does not belong in src/os/unix
  */
 
+#ifndef WIN32
+
 #include "apr.h"
 #include "apr_thread_proc.h"
 #include "apr_signal.h"
@@ -918,3 +920,5 @@ apr_status_t ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf)
 
     return APR_SUCCESS;
 }
+
+#endif /* WIN32 */