From e7e115c624e6868fd6a796cc7a46e3eb240476a0 Mon Sep 17 00:00:00 2001 From: Greg Stein Date: Sun, 11 Feb 2001 01:08:24 +0000 Subject: [PATCH] *) 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 --- server/log.c | 1 + server/mpm/dexter/dexter.c | 28 ++++++++++--------- server/mpm/experimental/perchild/perchild.c | 30 ++++++++++++--------- server/mpm/mpmt_pthread/mpmt_pthread.c | 1 + server/mpm/perchild/perchild.c | 30 ++++++++++++--------- server/mpm/prefork/prefork.c | 1 + support/htdigest.c | 18 +++++-------- 7 files changed, 61 insertions(+), 48 deletions(-) diff --git a/server/log.c b/server/log.c index 6d641dd0a3..0cfb4dae17 100644 --- a/server/log.c +++ b/server/log.c @@ -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 diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c index 810cb63ce8..4ce573491a 100644 --- a/server/mpm/dexter/dexter.c +++ b/server/mpm/dexter/dexter.c @@ -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 +#endif +#if APR_HAVE_SYS_SOCKET_H +#include +#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 -#endif +/* ### should be APR-ized */ #include -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_NETINET_TCP_H +#include + +#if HAVE_NETINET_TCP_H #include #endif -#include -#include /* * Actual definitions of config globals diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index b31333018c..8f3070dc41 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -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 +#endif +#if APR_HAVE_SYS_SOCKET_H +#include +#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 -#endif -#include -#ifdef HAVE_SYS_SOCKET_H -#include -#endif #ifdef HAVE_NETINET_TCP_H #include #endif + +/* ### should be APR-ized */ +#include #include #include #include #include #include -#include #include #include -#include /* * Actual definitions of config globals diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c index 623b7ce7a7..89702f831f 100644 --- a/server/mpm/mpmt_pthread/mpmt_pthread.c +++ b/server/mpm/mpmt_pthread/mpmt_pthread.c @@ -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 diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c index b31333018c..8f3070dc41 100644 --- a/server/mpm/perchild/perchild.c +++ b/server/mpm/perchild/perchild.c @@ -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 +#endif +#if APR_HAVE_SYS_SOCKET_H +#include +#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 -#endif -#include -#ifdef HAVE_SYS_SOCKET_H -#include -#endif #ifdef HAVE_NETINET_TCP_H #include #endif + +/* ### should be APR-ized */ +#include #include #include #include #include #include -#include #include #include -#include /* * Actual definitions of config globals diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index fb7bd83653..a8b7c80404 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -88,6 +88,7 @@ #include "apr_portable.h" #include "apr_strings.h" #include "apr_thread_proc.h" +#include "apr_signal.h" #define APR_WANT_STDIO #define APR_WANT_STRFUNC diff --git a/support/htdigest.c b/support/htdigest.c index bebf9fb6aa..0dd653a1d2 100644 --- a/support/htdigest.c +++ b/support/htdigest.c @@ -69,29 +69,23 @@ #include "apr_md5.h" #include "apr_lib.h" /* for apr_getpass() */ #include "apr_general.h" +#include "apr_signal.h" -#if APR_HAVE_STDIO_H -#include -#endif +#define APR_WANT_STDIO +#include "apr_want.h" #if APR_HAVE_SYS_TYPES_H #include #endif - -#if APR_HAVE_SYS_SIGNAL_H -#include -#endif - -#if APR_HAVE_SIGNAL_H -#include -#endif - +#if APR_HAVE_STDLIB_H #include +#endif #ifdef WIN32 #include #endif + #if APR_CHARSET_EBCDIC #define LF '\n' #define CR '\r' -- 2.50.1