Merge r884144 from trunk:

Win32 apr_{global,proc}_mutex_name() and apr_{global,proc}_mutex_lockfile()
returned the wrong information


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@884152 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/locks/win32/proc_mutex.c b/locks/win32/proc_mutex.c
index ecb6f14d4..3bd25efaf 100644
--- a/locks/win32/proc_mutex.c
+++ b/locks/win32/proc_mutex.c
@@ -186,12 +186,12 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *mutex)
 
 APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
 {
-    return NULL;
+    return mutex->fname;
 }
 
 APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
 {
-    return mutex->fname;
+    return apr_proc_mutex_defname();
 }
 
 APR_DECLARE(const char *) apr_proc_mutex_defname(void)