From: Ryan Bloom <rbb@apache.org>
Date: Sat, 29 Jul 2000 16:24:15 +0000 (+0000)
Subject: Remove iol_socket.h.  This file had one declaration, and it makes more
X-Git-Tag: APACHE_2_0_ALPHA_5~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c266de902942ef1637e5fc4071b7f948c59b3d54;p=thirdparty%2Fapache%2Fhttpd.git

Remove iol_socket.h.  This file had one declaration, and it makes more
sense for that declaraion to move to ap_iol.h.  This also modifies all of
the files that include iol_socket.h to include ap_iol.h


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

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 0d437bf863e..cbd982e9820 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -89,7 +89,7 @@
 #include "http_conf_globals.h" 
 #include "buff.h" 
 #include "ap_mpm.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "unixd.h"
 #include <sys/stat.h>
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index a7811aef6a8..4434254cf87 100644
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -61,7 +61,7 @@
 #include "mod_proxy.h"
 #include "http_log.h"
 #include "http_main.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 
 #ifdef HAVE_BSTRING_H
 #include <bstring.h>        /* for IRIX, FD_SET calls bzero() */
diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 15c9e40b68c..2a82df98dbd 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -62,7 +62,7 @@
 #include "http_main.h"
 #include "http_log.h"
 #include "http_core.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 
 #define AUTODETECT_PWD
 
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index e22ef00e6c2..7fc91b51d95 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -63,7 +63,7 @@
 #include "http_main.h"
 #include "http_core.h"
 #include "util_date.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 
 /*
  * Canonicalise http-like URLs.
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 4bcaf1701e8..4eda2e69d9d 100644
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -76,7 +76,7 @@
 #include "http_connection.h"
 #include "ap_mpm.h"
 #include "beosd.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "scoreboard.h" 
 #include <kernel/OS.h>
diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 6b1388ec67b..88ccc52f919 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -71,7 +71,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
 #include "mpm.h"
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index e320394ab98..a00c86e2cb0 100644
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -73,7 +73,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
 #include "mpm.h"
diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index 6c5c1992025..0efb4116772 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -72,7 +72,7 @@
 #include "http_connection.h"
 #include "ap_mpm.h"
 #include "beosd.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "scoreboard.h" 
 #include "poll.h"
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 0ae5cf28489..11e81420f93 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -72,7 +72,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "scoreboard.h" 
 
diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index e320394ab98..a00c86e2cb0 100644
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -73,7 +73,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
 #include "mpm.h"
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index e32911b140d..e22cf248a71 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -103,7 +103,7 @@
 #include "ap_mpm.h"
 #include "unixd.h"
 #include "mpm_common.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "ap_listen.h"
 #include "ap_mmn.h"
 #ifdef HAVE_SYS_TYPES_H
diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 978b6be2747..c004e925aaf 100644
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -71,7 +71,7 @@
 #include "scoreboard.h"
 #include "ap_mpm.h"
 #include "ap_listen.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "apr_portable.h"
 #include "mpm_common.h"
 
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 31012e40c09..a4c05604e06 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -70,7 +70,7 @@
 #include "ap_config.h"
 #include "ap_listen.h"
 #include "mpm_default.h"
-#include "iol_socket.h"
+#include "ap_iol.h"
 #include "mpm_winnt.h"
 #include "mpm_common.h"