svn commit: r884153 - /apr/apr/branches/1.3.x/locks/win32/proc_mutex.c

[tr...@apache.org]

Author: trawick
Date: Wed Nov 25 15:43:01 2009
New Revision: 884153

URL: http://svn.apache.org/viewvc?rev=884153&view=rev
Log:
Merge r884144 from trunk:

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

(intentionally omitted from CHANGES; I doubt anybody cares)

Modified:
    apr/apr/branches/1.3.x/locks/win32/proc_mutex.c

Modified: apr/apr/branches/1.3.x/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/locks/win32/proc_mutex.c?rev=884153&r1=884152&r2=884153&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/locks/win32/proc_mutex.c (original)
+++ apr/apr/branches/1.3.x/locks/win32/proc_mutex.c Wed Nov 25 15:43:01 2009
@@ -186,12 +186,12 @@
 
 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)