From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 22 Feb 2017 20:50:38 +0000 (+0000)
Subject: Add TFD_TIMER_CANCEL_ON_SET to sys/timerfd.h.
X-Git-Tag: glibc-2.26~761
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63e1c3768dad1b6e1ea6b46108da236792228fe4;p=thirdparty%2Fglibc.git

Add TFD_TIMER_CANCEL_ON_SET to sys/timerfd.h.

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.

	* sysdeps/unix/sysv/linux/sys/timerfd.h (TFD_TIMER_CANCEL_ON_SET):
	New enum constant and macro.
---

diff --git a/ChangeLog b/ChangeLog
index afae0c3b30c..0b368089469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2017-02-22  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/sys/timerfd.h (TFD_TIMER_CANCEL_ON_SET):
+	New enum constant and macro.
+
 	* scripts/build-many-glibcs.py (Context.checkout): Default Linux
 	kernel version to 4.10.
 
diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h
index 6899b5ea474..9811afe0fa5 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
   };