fix the "fix" in r883816

internal function ap_set_mutex() should be AP_DECLARE_NONSTD()
like our other directive parsers

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

diff --git a/include/util_mutex.h b/include/util_mutex.h
index a08cfc72fa4bdb7d29c567f5f31c2e175278a078..d9b575296e700f334482df96568974d21156166a 100644 (file)
--- a/include/util_mutex.h
+++ b/include/util_mutex.h
@@ -99,9 +99,9 @@ AP_DECLARE(apr_status_t) ap_parse_mutex(const char *arg, apr_pool_t *pool,
                                         const char **mutexfile);
 
 /* private function to process the Mutex directive */
-const char * ap_set_mutex(cmd_parms *cmd, void *dummy,
-                          const char *typelist,
-                          const char *mechfile);
+AP_DECLARE_NONSTD(const char *) ap_set_mutex(cmd_parms *cmd, void *dummy,
+                                             const char *typelist,
+                                             const char *mechfile);
 
 /**
  * option flags for ap_mutex_register(), ap_global_mutex_create(), and

diff --git a/server/util_mutex.c b/server/util_mutex.c
index 4944c8110354397116c7bb6c412e807230fc9a5c..8607a7d2ab485232f0240a3fb5becac47c57f0fd 100644 (file)
--- a/server/util_mutex.c
+++ b/server/util_mutex.c
@@ -164,8 +164,9 @@ static void mx_hash_init(apr_pool_t *p)
     apr_hash_set(mxcfg_by_type, "default", APR_HASH_KEY_STRING, def);
 }
 
-const char * ap_set_mutex(cmd_parms *cmd, void *dummy,
-                          const char *type, const char *mechdir)
+AP_DECLARE_NONSTD(const char *)ap_set_mutex(cmd_parms *cmd, void *dummy,
+                                            const char *type,
+                                            const char *mechdir)
 {
     apr_pool_t *p = cmd->pool;
     apr_lockmech_e mech;