From commits-return-14887-archive-asf-public=cust-asf.ponee.io@apr.apache.org Fri Jun 7 16:59:45 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 37E2018067E for ; Fri, 7 Jun 2019 18:59:45 +0200 (CEST) Received: (qmail 73823 invoked by uid 500); 7 Jun 2019 16:59:44 -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 73814 invoked by uid 99); 7 Jun 2019 16:59:44 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2019 16:59:44 +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 5D6883A3672 for ; Fri, 7 Jun 2019 16:59:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1860783 - /apr/apr/trunk/include/arch/win32/apr_arch_inherit.h Date: Fri, 07 Jun 2019 16:59:42 -0000 To: commits@apr.apache.org From: ivan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190607165943.5D6883A3672@svn01-us-west.apache.org> Author: ivan Date: Fri Jun 7 16:59:42 2019 New Revision: 1860783 URL: http://svn.apache.org/viewvc?rev=1860783&view=rev Log: Make apr_*_inherit_set() actually work on Windows. Modified: apr/apr/trunk/include/arch/win32/apr_arch_inherit.h Modified: apr/apr/trunk/include/arch/win32/apr_arch_inherit.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_inherit.h?rev=1860783&r1=1860782&r2=1860783&view=diff ============================================================================== --- apr/apr/trunk/include/arch/win32/apr_arch_inherit.h (original) +++ apr/apr/trunk/include/arch/win32/apr_arch_inherit.h Fri Jun 7 16:59:42 2019 @@ -24,20 +24,20 @@ #define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup) \ APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \ { \ -/* if (!SetHandleInformation(the##name->filehand, \ - * HANDLE_FLAG_INHERIT, \ - * HANDLE_FLAG_INHERIT)) \ - * return apr_get_os_error(); \ - */ return APR_SUCCESS; \ + if (!SetHandleInformation(the##name->filehand, \ + HANDLE_FLAG_INHERIT, \ + HANDLE_FLAG_INHERIT)) \ + return apr_get_os_error(); \ + return APR_SUCCESS; \ } #define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup) \ APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\ { \ -/* if (!SetHandleInformation(the##name->filehand, \ - * HANDLE_FLAG_INHERIT, 0)) \ - * return apr_get_os_error(); \ - */ return APR_SUCCESS; \ + if (!SetHandleInformation(the##name->filehand, \ + HANDLE_FLAG_INHERIT, 0)) \ + return apr_get_os_error(); \ + return APR_SUCCESS; \ }