From: Ryan Bloom <rbb@apache.org>
Date: Thu, 13 Jul 2000 16:05:07 +0000 (+0000)
Subject: Fix the prefork MPM to make it compile and work again out-of-the-box.
X-Git-Tag: APACHE_2_0_ALPHA_5~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2c19117546e1724078ed1e00cfa7b85405fc40a;p=apache

Fix the prefork MPM to make it compile and work again out-of-the-box.


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

diff --git a/include/ap_listen.h b/include/ap_listen.h
index 729ba5c50b..c5a016871d 100644
--- a/include/ap_listen.h
+++ b/include/ap_listen.h
@@ -57,6 +57,7 @@
 
 #include "apr_network_io.h"
 #include "http_config.h"
+#include "mpm.h"
 
 typedef struct ap_listen_rec ap_listen_rec;
 struct ap_listen_rec {
@@ -72,7 +73,7 @@ struct ap_listen_rec {
 extern ap_listen_rec *ap_listeners;
 
 void ap_listen_pre_config(void);
-#ifndef WIN32
+#if !defined(WIN32) && !defined(PREFORK_MPM)
 int ap_setup_listeners(server_rec *s);
 #else
 int ap_listen_open(process_rec *process, unsigned port);
diff --git a/server/listen.c b/server/listen.c
index c0715242c2..918931e156 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -64,6 +64,7 @@
 #include "http_config.h"
 #include "ap_listen.h"
 #include "http_log.h"
+#include "mpm.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -201,7 +202,7 @@ static void alloc_listener(process_rec *process, char *addr, unsigned int port)
     ap_listeners = new;
 }
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(PREFORK_MPM)
 static
 #endif
 int ap_listen_open(process_rec *process, unsigned port)
@@ -243,7 +244,7 @@ int ap_listen_open(process_rec *process, unsigned port)
     return num_open ? 0 : -1;
 }
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(PREFORK_MPM)
 int ap_setup_listeners(server_rec *s)
 {
     ap_listen_rec *lr;