aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/sys/timerfd.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index afae0c3b30..0b36808946 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 6899b5ea47..9811afe0fa 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
};