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

Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2011-04-02 15:28:16 -04:00
commit 955ce8cf2d
2 changed files with 3 additions and 0 deletions

View File

@ -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]

View File

@ -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.