Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E533F200C88 for ; Fri, 2 Jun 2017 20:56:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E3306160BD2; Fri, 2 Jun 2017 18:56:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 59996160BBA for ; Fri, 2 Jun 2017 20:56:11 +0200 (CEST) Received: (qmail 50920 invoked by uid 500); 2 Jun 2017 18:56:10 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 50911 invoked by uid 99); 2 Jun 2017 18:56:10 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jun 2017 18:56:10 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 772E33A0351 for ; Fri, 2 Jun 2017 18:56:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1797419 - /apr/apr/branches/1.7.x/locks/netware/proc_mutex.c Date: Fri, 02 Jun 2017 18:56:09 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170602185609.772E33A0351@svn01-us-west.apache.org> archived-at: Fri, 02 Jun 2017 18:56:12 -0000 Author: wrowe Date: Fri Jun 2 18:56:08 2017 New Revision: 1797419 URL: http://svn.apache.org/viewvc?rev=1797419&view=rev Log: Avoid API change during the remainder of 1.x, corresponds to 1.5 behavior Modified: apr/apr/branches/1.7.x/locks/netware/proc_mutex.c Modified: apr/apr/branches/1.7.x/locks/netware/proc_mutex.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/locks/netware/proc_mutex.c?rev=1797419&r1=1797418&r2=1797419&view=diff ============================================================================== --- apr/apr/branches/1.7.x/locks/netware/proc_mutex.c (original) +++ apr/apr/branches/1.7.x/locks/netware/proc_mutex.c Fri Jun 2 18:56:08 2017 @@ -129,9 +129,9 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu apr_proc_mutex_t *pmutex, apr_lockmech_e *mech) { - if (!pmutex->mutex) { - return APR_ENOLOCK; - } + if (pmutex && pmutex->mutex) + ospmutex = pmutex->mutex->mutex; + return APR_ENOLOCK; #if 0 /* We need to change apr_os_proc_mutex_t to a pointer type * to be able to implement this function. @@ -141,8 +141,6 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu *mech = APR_LOCK_DEFAULT; } return APR_SUCCESS; -#else - return APR_ENOTIMPL; #endif } @@ -161,7 +159,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu if (pool == NULL) { return APR_ENOPOOL; } - if (mech != APR_LOCK_DEFAULT) { + if (mech != APR_LOCK_DEFAULT && mech != APR_LOCK_DEFAULT_TIMED) { return APR_ENOTIMPL; } #if 0