From patchwork Sat Aug 15 02:27:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 507606 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 4C87D140187 for ; Sat, 15 Aug 2015 12:29:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=gn7T6Ndi; 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:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=SpvYzu433ZP6gE0QG7ysCKyXz/TuWJb viSZwdV6xwHMXpNXxK3Op5DwhGoZFH/8gNEg5ne+fNlErI/zWycrK1/6PGboHdNi irBws47ssnjkTAQP4x9s+PosmgYH/gvfbhKqhpM834yN8SOzurVw9SRYlHanv2WB 32RsJIGcjLrw= 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:subject:date:message-id:in-reply-to :references; s=default; bh=K69avoMnxmZM000kd59HJlnbX8Y=; b=gn7T6 NdiXfixr3sZ57M+TsKCWQUqFZgra1zeJGBO8I4Yhel9kU5PVxtA+m1Y11NvE7py+ gs7peFzXs6WDANcejE9xNZm7bwH+mspolSjDpxA2cdQ5E04rWWqaWiCPURf6gNvX SN0yP0TiZxzUPYKFRWMUYQgzpfFhCkAm4hxARU= Received: (qmail 114670 invoked by alias); 15 Aug 2015 02:28:07 -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 114609 invoked by uid 89); 15 Aug 2015 02:28:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH 09/10] hppa: timerfd.h: move to common sys/timerfd.h Date: Fri, 14 Aug 2015 22:27:52 -0400 Message-Id: <1439605673-23948-10-git-send-email-vapier@gentoo.org> In-Reply-To: <1439605673-23948-1-git-send-email-vapier@gentoo.org> References: <1439605673-23948-1-git-send-email-vapier@gentoo.org> Use the common sys/timerfd.h to avoid duplication and move the arch-specific settings into bits/timerfd.h. 2015-08-15 Mike Frysinger * sysdeps/unix/sysv/linux/hppa/bits/timerfd.h: New file. * sysdeps/unix/sysv/linux/hppa/sys/timerfd.h: Delete. --- .../unix/sysv/linux/hppa/{sys => bits}/timerfd.h | 36 ++-------------------- 1 file changed, 3 insertions(+), 33 deletions(-) rename sysdeps/unix/sysv/linux/hppa/{sys => bits}/timerfd.h (52%) diff --git a/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h b/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h similarity index 52% rename from sysdeps/unix/sysv/linux/hppa/sys/timerfd.h rename to sysdeps/unix/sysv/linux/hppa/bits/timerfd.h index aa59dcd..aba0b32 100644 --- a/sysdeps/unix/sysv/linux/hppa/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h @@ -12,14 +12,12 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see + License along with the GNU C Library; if not, see . */ #ifndef _SYS_TIMERFD_H -#define _SYS_TIMERFD_H 1 - -#include - +# error "Never use directly; include instead." +#endif /* Bits to be set in the FLAGS parameter of `timerfd_create'. */ enum @@ -29,31 +27,3 @@ enum TFD_NONBLOCK = 000200004 /* HPUX has separate NDELAY & NONBLOCK */ #define TFD_NONBLOCK TFD_NONBLOCK }; - - -/* Bits to be set in the FLAGS parameter of `timerfd_settime'. */ -enum - { - TFD_TIMER_ABSTIME = 1 << 0 -#define TFD_TIMER_ABSTIME TFD_TIMER_ABSTIME - }; - - -__BEGIN_DECLS - -/* Return file descriptor for new interval timer source. */ -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 - absolute. Optionally return the old expiration time in OTMR. */ -extern int timerfd_settime (int __ufd, int __flags, - const struct itimerspec *__utmr, - struct itimerspec *__otmr) __THROW; - -/* Return the next expiration time of UFD. */ -extern int timerfd_gettime (int __ufd, struct itimerspec *__otmr) __THROW; - -__END_DECLS - -#endif /* sys/timerfd.h */