From patchwork Tue Aug 30 01:16:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 663943 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 3sNVxd2BDGz9sBf for ; Tue, 30 Aug 2016 11:17:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=MQM3GKwU; 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:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=yncCzeKhhKr8194mCe4c5fcmF5qbnizJNNo5bJ/6vzGKI00Rj0N1F 7s66UCETZKeanFv2Zm32avFOEHZxaUBA+mJZqd8s+5TefHxZfmAFSzhXdqSbvDuq UH8K8wb0tlgAItXRt9XlZk8WBlfNw7uJ6KUybGz1INW/YOKR0Hbj+w= 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:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=pJNKbzgm3bEe9WWSPUy90804hQw=; b=MQM3GKwUzStOCHYzk7A6DZswOBqg XoZ7j7JgOfW+Alc0mMEpbjNYrVmFyJvcZxGR9LlMU/vgnshv3V2LvhHF+mecYLzY loOJEpubzpWB64It3oJUQazwm2vTx5uRvR6e1g+E41BjEh5DCdA0dEdbQxadxiKs DzLSNZFfVClOuN0= Received: (qmail 23671 invoked by alias); 30 Aug 2016 01:16:52 -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 23518 invoked by uid 89); 30 Aug 2016 01:16:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_05, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=expiration, _xopen_source, _XOPEN_SOURCE, UD:features.h X-HELO: l2mail1.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Cc: joseph@codesourcery.com Subject: [PATCH 12/13] Installed-header hygiene (BZ#20366): Miscellaneous. Date: Mon, 29 Aug 2016 21:16:44 -0400 Message-Id: <20160830011645.25769-13-zackw@panix.com> In-Reply-To: <20160830011645.25769-12-zackw@panix.com> References: <20160830011645.25769-1-zackw@panix.com> <20160830011645.25769-2-zackw@panix.com> <20160830011645.25769-3-zackw@panix.com> <20160830011645.25769-4-zackw@panix.com> <20160830011645.25769-5-zackw@panix.com> <20160830011645.25769-6-zackw@panix.com> <20160830011645.25769-7-zackw@panix.com> <20160830011645.25769-8-zackw@panix.com> <20160830011645.25769-9-zackw@panix.com> <20160830011645.25769-10-zackw@panix.com> <20160830011645.25769-11-zackw@panix.com> <20160830011645.25769-12-zackw@panix.com> MIME-Version: 1.0 Three small and relatively obvious changes: avoid some conditionally-defined names in the user namespace, and remove a #warning that was the sole actual problem with using sys/ipc.h without _GNU_SOURCE/_XOPEN_SOURCE. * sysdeps/unix/sysv/linux/sys/quota.h: Use __caddr_t instead of caddr_t. * sysdeps/unix/sysv/linux/sys/timerfd.h: Use __clockid_t instead of clockid_t. * sysvipc/sys/ipc.h: Remove unnecessary #warning. --- sysdeps/unix/sysv/linux/sys/quota.h | 2 +- sysdeps/unix/sysv/linux/sys/timerfd.h | 2 +- sysvipc/sys/ipc.h | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sys/quota.h b/sysdeps/unix/sysv/linux/sys/quota.h index 3e6b4ba..dfbc80f 100644 --- a/sysdeps/unix/sysv/linux/sys/quota.h +++ b/sysdeps/unix/sysv/linux/sys/quota.h @@ -219,7 +219,7 @@ struct dqinfo __BEGIN_DECLS extern int quotactl (int __cmd, const char *__special, int __id, - caddr_t __addr) __THROW; + __caddr_t __addr) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h index ea75aaa..492c488 100644 --- a/sysdeps/unix/sysv/linux/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/sys/timerfd.h @@ -36,7 +36,7 @@ enum __BEGIN_DECLS /* Return file descriptor for new interval timer source. */ -extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW; +extern int timerfd_create (__clockid_t __clock_id, int __flags) __THROW; /* Set next expiration time of interval timer source UFD to UTMR. If FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is diff --git a/sysvipc/sys/ipc.h b/sysvipc/sys/ipc.h index 70bd7a6..0392662 100644 --- a/sysvipc/sys/ipc.h +++ b/sysvipc/sys/ipc.h @@ -20,10 +20,6 @@ #include -#if !defined __USE_MISC && !defined __USE_XOPEN && __GNUC__ >= 2 -# warning "Files using this header must be compiled with _GNU_SOURCE or _XOPEN_SOURCE" -#endif - /* Get system dependent definition of `struct ipc_perm' and more. */ #include #include