diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string/string.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index b2e5b68cf8..25e1da152a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-16 Zack Weinberg <zackw@panix.com> + + * string/string.h: Remove obsolete comment stating that + strcoll_l and strxfrm_l have not yet been standardized. + 2016-11-16 Adhemerval Zanella <adhemerval.zanella@linaro.org> * hurd/hurd.h (__hurd_fail_noerrno): New function. diff --git a/string/string.h b/string/string.h index 57deaa4191..b103e64912 100644 --- a/string/string.h +++ b/string/string.h @@ -154,15 +154,13 @@ extern size_t strxfrm (char *__restrict __dest, __END_NAMESPACE_STD #ifdef __USE_XOPEN2K8 -/* The following functions are equivalent to the both above but they - take the locale they use for the collation as an extra argument. - This is not standardsized but something like will come. */ # include <xlocale.h> -/* Compare the collated forms of S1 and S2 using rules from L. */ +/* Compare the collated forms of S1 and S2, using sorting rules from L. */ extern int strcoll_l (const char *__s1, const char *__s2, __locale_t __l) __THROW __attribute_pure__ __nonnull ((1, 2, 3)); -/* Put a transformation of SRC into no more than N bytes of DEST. */ +/* Put a transformation of SRC into no more than N bytes of DEST, + using sorting rules from L. */ extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n, __locale_t __l) __THROW __nonnull ((2, 4)); #endif |