From patchwork Fri Jul 24 19:32:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 499857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8E5F91402ED for ; Sat, 25 Jul 2015 05:32:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=sPTQYtUU; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=mr4buC6wwde8W9XkfXqyFnR+aR7Y14sCXGgifFCNmnUwR4 Ws55KpsIoRoWEiGtQ6u3M9hglYDdO78e5dmx1OLmIQ+9VZq6RTiU9Z/A1veWKgAI EZC4bpLj8HE3+vKU7HeyXTAbSPuIgO5zedvuGA4w7idoM+wTnPv7M49OdQP/k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=p86hmlDv3eLFZ9bBdYGoq1HxuuA=; b=sPTQYtUU9Cq8ZYFqXjVk NpAgIS6VNRbA1K1NNIBJnzLxdC2GalPI855IIBlhSbh0mqehHMeyREYYDa5NfqRi 6NyUXe6LnWZXwdGQrvmM2vognSiWgROv/6NiErj4zoLZjRCiMDnTLoHD5691VbE5 LSfyP1ji6QupaD0r6wXRNHo= Received: (qmail 25597 invoked by alias); 24 Jul 2015 19:32:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 25546 invoked by uid 89); 24 Jul 2015 19:32:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Remove bogus O_SHLOCK, O_EXLOCK definitions. Message-Id: <20150724193246.81C562C3B34@topped-with-meat.com> Date: Fri, 24 Jul 2015 12:32:46 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=hOe2yjtxAAAA:8 a=kj9zAlcOel0A:10 a=Adu7Ud8zs_XY7o6eYi4A:9 a=CjuIK1q_8ugA:10 These obviously should never have been left in with XXX as their values. I had left those placeholders because I thought I might figure out values to use. But there aren't any, and nothing really needs them. So just remove them. Thanks, Roland 2015-07-24 Roland McGrath * sysdeps/nacl/bits/fcntl.h (O_SHLOCK, O_EXLOCK): Macros removed. diff --git a/sysdeps/nacl/bits/fcntl.h b/sysdeps/nacl/bits/fcntl.h index ceef8df..89aab00 100644 --- a/sysdeps/nacl/bits/fcntl.h +++ b/sysdeps/nacl/bits/fcntl.h @@ -35,10 +35,6 @@ #define O_ASYNC 020000 /* Send SIGIO to owner when data is ready. */ #define O_FSYNC 010000 /* Synchronous writes. */ #define O_SYNC O_FSYNC -#ifdef __USE_MISC -# define O_SHLOCK XXX /* Open with shared file lock. */ -# define O_EXLOCK XXX /* Open with shared exclusive lock. */ -#endif #ifdef __USE_XOPEN2K8 # define O_DIRECTORY 00200000 /* Must be a directory. */ # define O_NOFOLLOW 00400000 /* Do not follow links. */