Remove more spmt_os2 MPM leftovers.

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

diff --git a/STATUS b/STATUS
index 9d71ce2a8ddaeecbbfa41af6c0a10236d63bb8b3..e32c73fa59c67a6271dbd42be4c37fcf4a854a61 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2002/01/30 06:33:18 $]
+Last modified at [$Date: 2002/01/30 12:32:06 $]
 
 Release:
 
@@ -318,8 +318,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
 
     * Document mod_file_cache.
 
-    * OS/2: Make mod_status work for spmt_os2 MPM.
-
     * Platforms that do not support fork (primarily Win32 and AS/400)
       Architect start-up code that avoids initializing all the modules 
       in the parent process on platforms that do not support fork.

diff --git a/server/listen.c b/server/listen.c
index bc1796e3c140486f75f8d9fa28f743da99a79430..55ce7c1cf8e107e4b98bd1d07c45f2ee591ba3bc 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -271,10 +271,7 @@ static void alloc_listener(process_rec *process, char *addr, apr_port_t port)
     ap_listeners = new;
 }
 
-#if !defined(SPMT_OS2_MPM)
-static
-#endif
-int ap_listen_open(process_rec *process, apr_port_t port)
+static int ap_listen_open(process_rec *process, apr_port_t port)
 {
     apr_pool_t *pconf = process->pconf;
     ap_listen_rec *lr;

diff --git a/server/mpm/MPM.NAMING b/server/mpm/MPM.NAMING
index 328d713c6c3df6b684b957b4f8c519b83b266375..83c0694d115bfbb3b17d6be88a081b51cd6b8362 100644 (file)
--- a/server/mpm/MPM.NAMING
+++ b/server/mpm/MPM.NAMING
@@ -5,7 +5,6 @@ The following MPMs currently exist:
   perchild ...... Multi  Process Model with Threading.
                   Constant number of processes, variable number of threads
                   each child process can have a different uid/gid.  
-  spmt_os2 ...... Single Process Model with Threading on OS/2
   mpmt_os2 ...... Multi Process Model with Threading on OS/2
                   Constant number of processes, variable number of threads.
                   One acceptor thread per process, multiple workers threads.

diff --git a/server/mpm/mpmt_os2/mpm.h b/server/mpm/mpmt_os2/mpm.h
index 8291769685da2271d950040c220b85ba61ca8393..4b7307a417aeb2d4bae502ff11a45f61dd764783 100644 (file)
--- a/server/mpm/mpmt_os2/mpm.h
+++ b/server/mpm/mpmt_os2/mpm.h
@@ -72,4 +72,4 @@ extern server_rec *ap_server_conf;
 #define AP_MPM_WANT_SET_MAX_REQUESTS
 #define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
 
-#endif /* APACHE_MPM_SPMT_OS2_H */
+#endif /* APACHE_MPM_MPMT_OS2_H */