You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2011/05/31 22:55:02 UTC
svn commit: r1129914 - in /httpd/httpd/trunk/modules/core: mod_watchdog.c
mod_watchdog.h
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 <unistd.h> /* for getpid() */
+#endif
+#if APR_HAVE_PROCESS_H
+#include <process.h> /* for getpid() on Win32 */
+#endif
+
#include "mod_watchdog.h"
#include "ap_provider.h"
#include "ap_mpm.h"
Modified: httpd/httpd/trunk/modules/core/mod_watchdog.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.h?rev=1129914&r1=1129913&r2=1129914&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.h (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.h Tue May 31 20:55:02 2011
@@ -44,13 +44,6 @@
#include "apr_global_mutex.h"
#include "apr_thread_mutex.h"
-#if APR_HAVE_UNISTD_H
-#include <unistd.h> /* for getpid() */
-#endif
-#if APR_HAVE_PROCESS_H
-#include <process.h> /* for getpid() on Win32 */
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
Re: svn commit: r1129914 - in /httpd/httpd/trunk/modules/core: mod_watchdog.c
mod_watchdog.h
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 5/31/2011 4:05 PM, Jeff Trawick wrote:
> On Tue, May 31, 2011 at 4:55 PM, <wr...@apache.org> 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 <unistd.h> /* 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?
Re: svn commit: r1129914 - in /httpd/httpd/trunk/modules/core:
mod_watchdog.c mod_watchdog.h
Posted by Jeff Trawick <tr...@gmail.com>.
On Tue, May 31, 2011 at 4:55 PM, <wr...@apache.org> 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 <unistd.h> /* 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 ;)
> +#include <process.h> /* for getpid() on Win32 */
> +#endif
> +
> #include "mod_watchdog.h"
> #include "ap_provider.h"
> #include "ap_mpm.h"
>
> Modified: httpd/httpd/trunk/modules/core/mod_watchdog.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.h?rev=1129914&r1=1129913&r2=1129914&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/core/mod_watchdog.h (original)
> +++ httpd/httpd/trunk/modules/core/mod_watchdog.h Tue May 31 20:55:02 2011
> @@ -44,13 +44,6 @@
> #include "apr_global_mutex.h"
> #include "apr_thread_mutex.h"
>
> -#if APR_HAVE_UNISTD_H
> -#include <unistd.h> /* for getpid() */
> -#endif
> -#if APR_HAVE_PROCESS_H
> -#include <process.h> /* for getpid() on Win32 */
> -#endif
> -
> #ifdef __cplusplus
> extern "C" {
> #endif
>
>
>
--
Born in Roswell... married an alien...