You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/11/24 21:30:00 UTC
svn commit: r883859 - in /httpd/httpd/trunk: include/util_mutex.h
server/util_mutex.c
Author: trawick
Date: Tue Nov 24 20:30:00 2009
New Revision: 883859
URL: http://svn.apache.org/viewvc?rev=883859&view=rev
Log:
fix the "fix" in r883816
internal function ap_set_mutex() should be AP_DECLARE_NONSTD()
like our other directive parsers
Modified:
httpd/httpd/trunk/include/util_mutex.h
httpd/httpd/trunk/server/util_mutex.c
Modified: httpd/httpd/trunk/include/util_mutex.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_mutex.h?rev=883859&r1=883858&r2=883859&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_mutex.h (original)
+++ httpd/httpd/trunk/include/util_mutex.h Tue Nov 24 20:30:00 2009
@@ -99,9 +99,9 @@
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
Modified: httpd/httpd/trunk/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_mutex.c?rev=883859&r1=883858&r2=883859&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_mutex.c (original)
+++ httpd/httpd/trunk/server/util_mutex.c Tue Nov 24 20:30:00 2009
@@ -164,8 +164,9 @@
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;