[commits] r13367 - in /fsf/trunk/libc: ChangeLog include/features.h sysdeps/unix/sysv/linux/bits/time.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Apr  3 00:13:25 2011
New Revision: 13367

Log:
Import glibc-mainline for 2011-04-03

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/include/features.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/time.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Apr  3 00:13:25 2011
@@ -1,3 +1,9 @@
+2011-04-02  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* 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@xxxxxxxxx>
 
 	[BZ #12518]

Modified: fsf/trunk/libc/include/features.h
==============================================================================
--- fsf/trunk/libc/include/features.h (original)
+++ fsf/trunk/libc/include/features.h Sun Apr  3 00:13:25 2011
@@ -68,6 +68,7 @@
    __USE_UNIX98		Define Single Unix V2 things.
    __USE_XOPEN2K        Define XPG6 things.
    __USE_XOPEN2KXSI     Define XPG6 XSI things.
+   __USE_XOPEN2K8       Define XPG7 things.
    __USE_XOPEN2K8XSI    Define XPG7 XSI things.
    __USE_LARGEFILE	Define correct standard I/O things.
    __USE_LARGEFILE64	Define LFS things with separate names.

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/time.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/time.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/time.h Sun Apr  3 00:13:25 2011
@@ -71,6 +71,8 @@
 #   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