aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-02-22 20:50:38 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-02-22 20:50:38 +0000
commit63e1c3768dad1b6e1ea6b46108da236792228fe4 (patch)
tree31f7fcaa9d2fbc49f70d67c3177f63256a99e8e5
parentbf0b5360da68421a03f52e2178240728c402a719 (diff)
downloadglibc-63e1c3768dad1b6e1ea6b46108da236792228fe4.zip
glibc-63e1c3768dad1b6e1ea6b46108da236792228fe4.tar.gz
glibc-63e1c3768dad1b6e1ea6b46108da236792228fe4.tar.bz2
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.
-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 afae0c3..0b36808 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 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
};