httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <traw...@gmail.com>
Subject Re: svn commit: r1129914 - in /httpd/httpd/trunk/modules/core: mod_watchdog.c mod_watchdog.h
Date Tue, 31 May 2011 21:05:17 GMT
On Tue, May 31, 2011 at 4:55 PM,  <wrowe@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...

Mime
View raw message