Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1738796 -
 /apr/apr/branches/1.6.x/locks/unix/proc_mutex.c
Date: Tue, 12 Apr 2016 13:09:00 -0000
To: commits@apr.apache.org
From: ylavic@apache.org
Message-Id: <20160412130901.312E53A0186@svn01-us-west.apache.org>

Author: ylavic
Date: Tue Apr 12 13:09:00 2016
New Revision: 1738796

URL: http://svn.apache.org/viewvc?rev=1738796&view=rev
Log:
apr_proc_mutex-pthread: follow up to r1738793.
Fix munmap()ing size of the pthread_interproc mutex to match the mmap()ed one.

This was fixed in trunk by r1733775 which is barely related and will be
backported later, hence this standalone fix.

Modified:
    apr/apr/branches/1.6.x/locks/unix/proc_mutex.c

Modified: apr/apr/branches/1.6.x/locks/unix/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/locks/unix/proc_mutex.c?rev=1738796&r1=1738795&r2=1738796&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/locks/unix/proc_mutex.c (original)
+++ apr/apr/branches/1.6.x/locks/unix/proc_mutex.c Tue Apr 12 13:09:00 2016
@@ -480,7 +480,8 @@ static apr_status_t proc_mutex_proc_pthr
             return rv;
         }
     }
-    if (munmap((caddr_t)mutex->pthread_interproc, sizeof(pthread_mutex_t))) {
+    if (munmap((caddr_t)mutex->pthread_interproc,
+               sizeof(proc_pthread_mutex_t))) {
         return errno;
     }
     return APR_SUCCESS;