httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1090614 - in /httpd/httpd/trunk: CHANGES include/mpm_common.h server/mpm/winnt/mpm_winnt.c server/mpm_unix.c
Date Sat, 09 Apr 2011 15:56:28 GMT
Author: trawick
Date: Sat Apr  9 15:56:27 2011
New Revision: 1090614

URL: http://svn.apache.org/viewvc?rev=1090614&view=rev
Log:
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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/include/mpm_common.h
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
    httpd/httpd/trunk/server/mpm_unix.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1090614&r1=1090613&r2=1090614&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Apr  9 15:56:27 2011
@@ -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>]
 

Modified: httpd/httpd/trunk/include/mpm_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=1090614&r1=1090613&r2=1090614&view=diff
==============================================================================
--- httpd/httpd/trunk/include/mpm_common.h (original)
+++ httpd/httpd/trunk/include/mpm_common.h Sat Apr  9 15:56:27 2011
@@ -212,6 +212,8 @@ AP_DECLARE(gid_t) ap_gname2id(const char
 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_sign
  */
 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.

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=1090614&r1=1090613&r2=1090614&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Sat Apr  9 15:56:27 2011
@@ -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.
  */

Modified: httpd/httpd/trunk/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_unix.c?rev=1090614&r1=1090613&r2=1090614&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_unix.c (original)
+++ httpd/httpd/trunk/server/mpm_unix.c Sat Apr  9 15:56:27 2011
@@ -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(serve
 
     return APR_SUCCESS;
 }
+
+#endif /* WIN32 */



Mime
View raw message