fix the "fix" in r883816

trawick · trawick · commit 73333b35a504 · 2009-11-24T20:30:00.000Z
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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -164,8 +164,9 @@ static void mx_hash_init(apr_pool_t *p)`
`164`	`164`	`apr_hash_set(mxcfg_by_type, "default", APR_HASH_KEY_STRING, def);`
`165`	`165`	`}`
`166`	`166`
`167`		`-const char * ap_set_mutex(cmd_parms cmd, void dummy,`
`168`		`- const char type, const char mechdir)`
	`167`	`+AP_DECLARE_NONSTD(const char )ap_set_mutex(cmd_parms cmd, void *dummy,`
	`168`	`+ const char *type,`
	`169`	`+ const char *mechdir)`
`169`	`170`	`{`
`170`	`171`	`apr_pool_t *p = cmd->pool;`
`171`	`172`	`apr_lockmech_e mech;`