diff options
| author | Jeff Trawick <trawick@apache.org> | 2009-11-25 15:40:24 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2009-11-25 15:40:24 +0000 |
| commit | 91fb233e5dff3a2601355114a433447515c882c1 (patch) | |
| tree | 15061eb751ba52e75903419f90fa97fd5a65fe4c /locks | |
| parent | 64e1c93a7877f3364b62062f80d1d643a1c1fc41 (diff) | |
| download | apr-91fb233e5dff3a2601355114a433447515c882c1.tar.gz | |
Merge r884144 from trunk:
Win32 apr_{global,proc}_mutex_name() and apr_{global,proc}_mutex_lockfile()
returned the wrong information
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@884152 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
| -rw-r--r-- | locks/win32/proc_mutex.c | 4 |
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) |