*) 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

diff --git a/server/log.c b/server/log.c
index 6d641dd0a3e48b6f8d65b39e2f4cc77beda424d4..0cfb4dae17551b3d416b072e5350cc149a6e3819 100644 (file)
--- 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 810cb63ce8834208ebbd3a086faf65c456634f44..4ce573491aa0928a6cd9b9b18342b66bd5acf5a5 100644 (file)
--- 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 <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

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index b31333018c937597ca9c2d359444f11df6157308..8f3070dc417ab72d9eaf4cbd0588d2176962396d 100644 (file)
--- 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 <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

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 623b7ce7a7276330fafe5fa919f9813c2c10c58c..89702f831fc8735eb86d84074a55e9378dcedd92 100644 (file)
--- 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 <unistd.h>

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index b31333018c937597ca9c2d359444f11df6157308..8f3070dc417ab72d9eaf4cbd0588d2176962396d 100644 (file)
--- 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 <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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index fb7bd8365332bee42c41c42b4eeb6996cff04b8a..a8b7c80404f9e2c1135ac7ffacadf12b3097fdd5 100644 (file)
--- 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 bebf9fb6aa3a9ab50103602c33ecfc42a3e4bf0e..0dd653a1d2c7ad64a6ef48ef11b2f80092fe0f62 100644 (file)
--- 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 <stdio.h>
-#endif
+#define APR_WANT_STDIO
+#include "apr_want.h"
 
 #if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-
-#if APR_HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
-
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
+#if APR_HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #ifdef WIN32
 #include <conio.h>
 #endif
 
+
 #if APR_CHARSET_EBCDIC
 #define LF '\n'
 #define CR '\r'