From patchwork Wed Feb 22 18:02:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 731257 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 3vT4w30bdYz9s7d for ; Thu, 23 Feb 2017 05:02:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="N8OgHWzm"; 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:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=jb5h971dbuzbKUrRtWBQKG+vPJloD nOtnpOUCPiBZRf9pDWmXes4rP1rdN0nL7wz/Ew2wEYG5fhiNHFyoKUAfJZz/2cde dfyQ/prPWS18rBVUWYosrRHNis6uCqxQjEHm9isAm6xJOukiXh8pjQuHbre5NWiF 3oGcAD7ZqnUAp0= 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:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=L0Dn5mBPH532afmvc/I27zdzz28=; b=N8O gHWzmgq071oUuXtqJnQtLxhJkvPAJLixIb0ozAi6vngZxl9XMAnO25WQLBXB7i3I MNLkK+saoUtopYPgAsbHODvsGP8gAQTgC9yd0QY52rlpcR+FfToQeu1REOxsYzro JqQckBCP5NwWetYFuDbYqpckRMNlbghZmxUtHjoo= Received: (qmail 25607 invoked by alias); 22 Feb 2017 18:02:32 -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 25579 invoked by uid 89); 22 Feb 2017 18:02:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=2810 X-HELO: relay1.mentorg.com Date: Wed, 22 Feb 2017 18:02:21 +0000 From: Joseph Myers To: Subject: Add TFD_TIMER_CANCEL_ON_SET to sys/timerfd.h Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) In Linux 4.10, timerfd constants moved to a new uapi header, which showed up that glibc's sys/timerfd.h is missing the old flag TFD_TIMER_CANCEL_ON_SET. This patch adds that flag to glibc's header. Tested for x86_64. 2017-02-22 Joseph Myers * sysdeps/unix/sysv/linux/sys/timerfd.h (TFD_TIMER_CANCEL_ON_SET): New enum constant and macro. diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h index 6899b5e..9811afe 100644 --- a/sysdeps/unix/sysv/linux/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/sys/timerfd.h @@ -28,8 +28,10 @@ /* Bits to be set in the FLAGS parameter of `timerfd_settime'. */ enum { - TFD_TIMER_ABSTIME = 1 << 0 + TFD_TIMER_ABSTIME = 1 << 0, #define TFD_TIMER_ABSTIME TFD_TIMER_ABSTIME + TFD_TIMER_CANCEL_ON_SET = 1 << 1 +#define TFD_TIMER_CANCEL_ON_SET TFD_TIMER_CANCEL_ON_SET };