From: Jeff Trawick <trawick@apache.org>
Date: Mon, 8 Feb 2010 16:59:45 +0000 (+0000)
Subject: change the preprocessor define ap_accept_mutex_type to upper case
X-Git-Tag: 2.3.6~503
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aecc198b9367e37557dc1b6b88d0d4748e26ae7a;p=thirdparty%2Fapache%2Fhttpd.git

change the preprocessor define ap_accept_mutex_type to upper case


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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index a12d6d02339..ebca2b766ff 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -330,7 +330,7 @@ AP_DECLARE_HOOK(const char *,mpm_get_name,(void))
 /* mutex type string for accept mutex, if any; MPMs should use the
  * same mutex type for ease of configuration
  */
-#define ap_accept_mutex_type "mpm-accept"
+#define AP_ACCEPT_MUTEX_TYPE "mpm-accept"
 
 #ifdef __cplusplus
 }
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index c1e0c1412f1..56496cea565 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -915,7 +915,7 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     ap_log_pid(pconf, ap_pid_fname);
 
     /* Initialize cross-process accept lock */
-    rv = ap_proc_mutex_create(&accept_mutex, ap_accept_mutex_type, NULL, s,
+    rv = ap_proc_mutex_create(&accept_mutex, AP_ACCEPT_MUTEX_TYPE, NULL, s,
                               _pconf, 0);
     if (rv != APR_SUCCESS) {
         mpm_state = AP_MPMQ_STOPPING;
@@ -1268,7 +1268,7 @@ static int prefork_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp
         foreground = ap_exists_config_define("FOREGROUND");
     }
 
-    ap_mutex_register(p, ap_accept_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
+    ap_mutex_register(p, AP_ACCEPT_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0);
 
     /* sigh, want this only the second time around */
     retained = ap_retained_data_get(userdata_key);
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index d633ed1bdea..052da59fff2 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1707,7 +1707,7 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     ap_log_pid(pconf, ap_pid_fname);
 
     /* Initialize cross-process accept lock */
-    rv = ap_proc_mutex_create(&accept_mutex, ap_accept_mutex_type, NULL, s,
+    rv = ap_proc_mutex_create(&accept_mutex, AP_ACCEPT_MUTEX_TYPE, NULL, s,
                               _pconf, 0);
     if (rv != APR_SUCCESS) {
         mpm_state = AP_MPMQ_STOPPING;
@@ -1950,7 +1950,7 @@ static int worker_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
         foreground = ap_exists_config_define("FOREGROUND");
     }
 
-    ap_mutex_register(pconf, ap_accept_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
+    ap_mutex_register(pconf, AP_ACCEPT_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0);
 
     /* sigh, want this only the second time around */
     retained = ap_retained_data_get(userdata_key);