Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 87262 invoked from network); 9 Apr 2011 15:56:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Apr 2011 15:56:53 -0000 Received: (qmail 33387 invoked by uid 500); 9 Apr 2011 15:56:53 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 33342 invoked by uid 500); 9 Apr 2011 15:56:53 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 33335 invoked by uid 99); 9 Apr 2011 15:56:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Apr 2011 15:56:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Apr 2011 15:56:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2B62F238890A; Sat, 9 Apr 2011 15:56:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110409155628.2B62F238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 + , Jeff Trawick] + *) core: Support module names with colons in loglevel configuration. [Torsten Förtsch ] 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 */