Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 8794892..058f3de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * 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]

diff --git a/include/features.h b/include/features.h
index d9b6de9..c66bc26 100644 (file)
--- a/include/features.h
+++ b/include/features.h
@@ -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.