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.13-68-g955ce8c
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Apr 2011 19:28:22 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.13-68-g955ce8c
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 955ce8cf2d884b3419c058de562174046daad95b (commit)
via 94521213b6b157037944693f56dec159da0084bc (commit)
from 81489b2ec3e21ae4fae5ff10fe578388d4d8a982 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=955ce8cf2d884b3419c058de562174046daad95b
commit 955ce8cf2d884b3419c058de562174046daad95b
Merge: 9452121 81489b2
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Apr 2 15:28:16 2011 -0400
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
diff --cc ChangeLog
index 8794892,ac0c772..058f3de
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
2011-04-02 Ulrich Drepper <drepper@gmail.com>
+ * sysdeps/unix/sysv/linux/bits/time.h (CLOCK_BOOTTIME): Define.
+
+ * include/features.h: Mention __USW_XOPEN2K8 in comment.
+
2011-03-26 H.J. Lu <hongjiu.lu@intel.com>
[BZ #12518]
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=94521213b6b157037944693f56dec159da0084bc
commit 94521213b6b157037944693f56dec159da0084bc
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Apr 2 15:27:07 2011 -0400
Define CLOCK_BOOTTIME.
diff --git a/ChangeLog b/ChangeLog
index ff87466..8794892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-02 Ulrich Drepper <drepper@gmail.com>
+
+ * sysdeps/unix/sysv/linux/bits/time.h (CLOCK_BOOTTIME): Define.
+
2011-03-26 H.J. Lu <hongjiu.lu@intel.com>
[BZ #12518]
diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h
index 02a0511..a0d4b78 100644
--- a/sysdeps/unix/sysv/linux/bits/time.h
+++ b/sysdeps/unix/sysv/linux/bits/time.h
@@ -71,6 +71,8 @@ extern long int __sysconf (int);
# define CLOCK_REALTIME_COARSE 5
/* Monotonic system-wide clock, updated only on ticks. */
# define CLOCK_MONOTONIC_COARSE 6
+/* Monotonic system-wide clock that includes time spent in suspension. */
+# define CLOCK_BOOTTIME 7
/* Flag to indicate time is absolute. */
# define TIMER_ABSTIME 1
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
sysdeps/unix/sysv/linux/bits/time.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources