Commit 75d79357 authored by Greg Stein's avatar Greg Stein
Browse files

*) include "apr_signal.h" when needed 

*) some other minor include tweaks


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88081 13f79535-47bb-0310-9956-ffa450edef68
parent 0caa8a4f

server/log.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#include "apr_errno.h"

#include "apr_thread_proc.h"

#include "apr_lib.h"

#include "apr_signal.h"



#define APR_WANT_STDIO

#define APR_WANT_STRFUNC

server/mpm/dexter/dexter.c

+16 −12
Original line number Diff line number Diff line
@@ -56,12 +56,21 @@ 
 * University of Illinois, Urbana-Champaign.

 */



#define CORE_PRIVATE 

 

#include "ap_config.h"

#include "apr_portable.h"

#include "apr_strings.h"

#include "apr_file_io.h"

#include "apr_signal.h"



#if APR_HAVE_UNISTD_H

#include <unistd.h>

#endif

#if APR_HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif



#define CORE_PRIVATE 

 

#include "ap_config.h"

#include "httpd.h" 

#include "http_main.h" 

#include "http_log.h"
@@ -76,18 +85,13 @@ 
#include "mpm.h"

#include "scoreboard.h"



#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

/* ### should be APR-ized */

#include <poll.h>

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_NETINET_TCP_H

#include <pthread.h>



#if HAVE_NETINET_TCP_H

#include <netinet/tcp.h>

#endif

#include <pthread.h>

#include <signal.h>



/*

 * Actual definitions of config globals

server/mpm/experimental/perchild/perchild.c

+18 −12
Original line number Diff line number Diff line
@@ -56,14 +56,26 @@ 
 * University of Illinois, Urbana-Champaign.

 */



#define CORE_PRIVATE 

 

#include "ap_config.h"

#include "apr_hash.h"

#include "apr_strings.h"

#include "apr_pools.h"

#include "apr_portable.h"

#include "apr_file_io.h"

#include "apr_signal.h"



#define APR_WANT_IOVEC

#include "apr_want.h"



#if APR_HAVE_UNISTD_H

#include <unistd.h>

#endif

#if APR_HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif



#define CORE_PRIVATE 

 

#include "ap_config.h"

#include "httpd.h" 

#include "http_main.h" 

#include "http_log.h"
@@ -80,25 +92,19 @@ 
#include "scoreboard.h"

#include "util_filter.h"



#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

#include <poll.h>

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_NETINET_TCP_H

#include <netinet/tcp.h>

#endif



/* ### should be APR-ized */

#include <poll.h>

#include <grp.h>

#include <pwd.h>

#include <pthread.h>

#include <sys/stat.h>

#include <sys/un.h>

#include <signal.h>

#include <setjmp.h>

#include <stropts.h>

#include <sys/uio.h>



/*

 * Actual definitions of config globals

server/mpm/mpmt_pthread/mpmt_pthread.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include "apr_strings.h"

#include "apr_file_io.h"

#include "apr_thread_proc.h"

#include "apr_signal.h"



#if APR_HAVE_UNISTD_H

#include <unistd.h>

server/mpm/perchild/perchild.c

+18 −12
Original line number Diff line number Diff line
@@ -56,14 +56,26 @@ 
 * University of Illinois, Urbana-Champaign.

 */



#define CORE_PRIVATE 

 

#include "ap_config.h"

#include "apr_hash.h"

#include "apr_strings.h"

#include "apr_pools.h"

#include "apr_portable.h"

#include "apr_file_io.h"

#include "apr_signal.h"



#define APR_WANT_IOVEC

#include "apr_want.h"



#if APR_HAVE_UNISTD_H

#include <unistd.h>

#endif

#if APR_HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif



#define CORE_PRIVATE 

 

#include "ap_config.h"

#include "httpd.h" 

#include "http_main.h" 

#include "http_log.h"
@@ -80,25 +92,19 @@ 
#include "scoreboard.h"

#include "util_filter.h"



#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

#include <poll.h>

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_NETINET_TCP_H

#include <netinet/tcp.h>

#endif



/* ### should be APR-ized */

#include <poll.h>

#include <grp.h>

#include <pwd.h>

#include <pthread.h>

#include <sys/stat.h>

#include <sys/un.h>

#include <signal.h>

#include <setjmp.h>

#include <stropts.h>

#include <sys/uio.h>



/*

 * Actual definitions of config globals