diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-04-02 15:28:16 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-04-02 15:28:16 -0400 |
| commit | 955ce8cf2d884b3419c058de562174046daad95b (patch) | |
| tree | 235310d163537723a4606945de5a84030d4f7246 | |
| parent | 94521213b6b157037944693f56dec159da0084bc (diff) | |
| parent | 81489b2ec3e21ae4fae5ff10fe578388d4d8a982 (diff) | |
| download | glibc-955ce8cf2d884b3419c058de562174046daad95b.tar.gz glibc-955ce8cf2d884b3419c058de562174046daad95b.tar.xz glibc-955ce8cf2d884b3419c058de562174046daad95b.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | include/features.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 8794892142..058f3de822 100644 --- 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 d9b6de9cf1..c66bc26db8 100644 --- 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. |