Return-Path: X-Original-To: apmail-httpd-dev-archive@www.apache.org Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BAED04858 for ; Tue, 31 May 2011 23:16:37 +0000 (UTC) Received: (qmail 91643 invoked by uid 500); 31 May 2011 23:16:36 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 91586 invoked by uid 500); 31 May 2011 23:16:36 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 91578 invoked by uid 99); 31 May 2011 23:16:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 May 2011 23:16:36 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [72.167.82.85] (HELO p3plsmtpa01-05.prod.phx3.secureserver.net) (72.167.82.85) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 31 May 2011 23:16:30 +0000 Received: (qmail 10733 invoked from network); 31 May 2011 23:16:09 -0000 Received: from unknown (76.252.112.72) by p3plsmtpa01-05.prod.phx3.secureserver.net (72.167.82.85) with ESMTP; 31 May 2011 23:16:08 -0000 Message-ID: <4DE5768B.2010601@rowe-clan.net> Date: Tue, 31 May 2011 18:15:23 -0500 From: "William A. Rowe Jr." User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.17) Gecko/20110414 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: dev@httpd.apache.org Subject: Re: svn commit: r1129914 - in /httpd/httpd/trunk/modules/core: mod_watchdog.c mod_watchdog.h References: <20110531205502.6F99C2388906@eris.apache.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 5/31/2011 4:05 PM, Jeff Trawick wrote: > On Tue, May 31, 2011 at 4:55 PM, wrote: >> Author: wrowe >> Date: Tue May 31 20:55:02 2011 >> New Revision: 1129914 >> >> URL: http://svn.apache.org/viewvc?rev=1129914&view=rev >> Log: >> solve getpid() process.h function order >> >> Modified: >> httpd/httpd/trunk/modules/core/mod_watchdog.c >> httpd/httpd/trunk/modules/core/mod_watchdog.h >> >> Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c >> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=1129914&r1=1129913&r2=1129914&view=diff >> ============================================================================== >> --- httpd/httpd/trunk/modules/core/mod_watchdog.c (original) >> +++ httpd/httpd/trunk/modules/core/mod_watchdog.c Tue May 31 20:55:02 2011 >> @@ -17,6 +17,14 @@ >> /* Watchdog module. >> */ >> >> +#include "apr.h" >> +#if APR_HAVE_UNISTD_H >> +#include /* for getpid() */ >> +#endif >> +#if APR_HAVE_PROCESS_H > > I guess this is with apr 1.4, as I believe you deleted that feature in > apr trunk ;) I expect that's right. Although mod_watchdog.h didn't need to pollute the namespace of every consumer of mod_watchdog, so this patch should be ok on either apr :) Should we go ahead and drop in process.h unilaterally in apr.h.in/apr.hw following windows.h? WDYT?