This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.25-64-g63e1c37
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Feb 2017 20:51:13 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-64-g63e1c37
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 63e1c3768dad1b6e1ea6b46108da236792228fe4 (commit)
from bf0b5360da68421a03f52e2178240728c402a719 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=63e1c3768dad1b6e1ea6b46108da236792228fe4
commit 63e1c3768dad1b6e1ea6b46108da236792228fe4
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Feb 22 20:50:38 2017 +0000
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 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
};
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
sysdeps/unix/sysv/linux/sys/timerfd.h | 4 +++-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources