From: Jeff Trawick <trawick@apache.org>
Date: Thu, 26 Mar 2009 15:03:57 +0000 (+0000)
Subject: axe the unnecessary AP_MPM_HARD_LIMITS_FILE
X-Git-Tag: 2.3.3~800
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b84e4404d2b1e74531c6830fb511ef691a944bac;p=apache

axe the unnecessary AP_MPM_HARD_LIMITS_FILE


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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index 506e92c146..f4f68340a5 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -193,8 +193,6 @@ AP_DECLARE(uid_t) ap_uname2id(const char *name);
 AP_DECLARE(gid_t) ap_gname2id(const char *name);
 #endif
 
-#define AP_MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
-
 typedef struct ap_pod_t ap_pod_t;
 
 struct ap_pod_t {
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 248be2aed9..d6b554e1af 100644
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -54,6 +54,8 @@
 #include "apr_thread_mutex.h"
 #include "apr_poll.h"
 
+#define MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
+
 extern int _kset_fd_limit_(int num);
 
 /* Limit on the total --- clients will be locked out if more servers than
@@ -1105,7 +1107,7 @@ static int beos_check_config(apr_pool_t *pconf, apr_pool_t *plog,
                          " To increase, please see the HARD_THREAD_LIMIT"
                          "define in");
             ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
-                         " server/mpm/beos%s.", AP_MPM_HARD_LIMITS_FILE);
+                         " server/mpm/beos%s.", MPM_HARD_LIMITS_FILE);
         } else {
             ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
                          "MaxClients of %d exceeds compile-time limit "
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 421e631dea..9d16fe900b 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -106,6 +106,8 @@
 #define WORKER_READY        SERVER_READY
 #define WORKER_IDLE_KILL    SERVER_IDLE_KILL
 
+#define MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
+
 /* config globals */
 
 int ap_threads_per_child=0;         /* Worker threads per child */
@@ -1020,7 +1022,7 @@ static int netware_check_config(apr_pool_t *p, apr_pool_t *plog,
                          " To increase, please see the HARD_THREAD_LIMIT"
                          "define in");
             ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
-                         " server/mpm/netware%s.", AP_MPM_HARD_LIMITS_FILE);
+                         " server/mpm/netware%s.", MPM_HARD_LIMITS_FILE);
         } else {
             ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
                          "MaxThreads of %d exceeds compile-time limit "