[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r884152 - /apr/apr/branches/1.4.x/locks/win32/proc_mutex.c
From:       trawick () apache ! org
Date:       2009-11-25 15:40:24
Message-ID: 20091125154024.71F9623888D6 () eris ! apache ! org
[Download RAW message or body]

Author: trawick
Date: Wed Nov 25 15:40:24 2009
New Revision: 884152

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

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

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

Modified: apr/apr/branches/1.4.x/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/locks/win32/proc_mutex.c?rev=884152&r1=884151&r2=884152&view=diff
 ==============================================================================
--- apr/apr/branches/1.4.x/locks/win32/proc_mutex.c (original)
+++ apr/apr/branches/1.4.x/locks/win32/proc_mutex.c Wed Nov 25 15:40:24 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)


[prev in list] [next in list] [prev in thread] [next in thread]