diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/locales/bn_BD | 4 | ||||
| -rw-r--r-- | localedata/locales/en_NZ | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c | 3 | ||||
| -rw-r--r-- | posix/bits/unistd.h | 2 | ||||
| -rw-r--r-- | posix/unistd.h | 2 |
7 files changed, 19 insertions, 7 deletions
@@ -1,3 +1,9 @@ +2006-05-21 Joseph S. Myers <joseph@codesourcery.com> + + * posix/unistd.h (getlogin_r): Condition on __USE_POSIX199506, not + __USE_UNIX98. + * posix/bits/unistd.h: Likewise. + 2006-05-15 Mike Frysinger <vapier@gentoo.org> [BZ #2751] diff --git a/localedata/ChangeLog b/localedata/ChangeLog index f31a0d049a..3894ca6919 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2006-08-23 Ulrich Drepper <drepper@redhat.com> + + * locales/en_NZ: Define am/pm formats. + 2006-08-22 Ulrich Drepper <drepper@redhat.com> * locales/nn_NO: Copy more categories from nb_NO. diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD index 196b42dbc3..23f821ad6e 100644 --- a/localedata/locales/bn_BD +++ b/localedata/locales/bn_BD @@ -73,7 +73,7 @@ END LC_NUMERIC LC_TIME abday "<U09B0><U09AC><U09BF>"; / "<U09B8><U09CB><U09AE>";/ - "<U09AE><U0999><U0997><U09B2>";/ + "<U09AE><U0999><U09CD><U0997><U09B2>";/ "<U09AC><U09C1><U09A7>";/ "<U09AC><U09C3><U09B9><U0983>";/ "<U09B6><U09C1><U0995><U09CD><U09B0>";/ @@ -81,7 +81,7 @@ abday "<U09B0><U09AC><U09BF>"; / day "<U09B0><U09AC><U09BF><U09AC><U09BE><U09B0>";/ "<U09B8><U09CB><U09AE><U09AC><U09BE><U09B0>";/ - "<U09AE><U0999><U0997><U09B2><U09AC><U09BE><U09B0>";/ + "<U09AE><U0999><U09CD><U0997><U09B2><U09AC><U09BE><U09B0>";/ "<U09AC><U09C1><U09A7><U09AC><U09BE><U09B0>";/ "<U09AC><U09C3><U09B9><U09B8><U09CD><U09AA><U09A4><U09BF><U09AC><U09BE><U09B0>";/ "<U09B6><U09C1><U0995><U09CD><U09B0><U09AC><U09BE><U09B0>";/ diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ index d3f7e636cf..82470f57c3 100644 --- a/localedata/locales/en_NZ +++ b/localedata/locales/en_NZ @@ -111,8 +111,9 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>" t_fmt "<U0025><U0054>" -am_pm "";"" -t_fmt_ampm "" +am_pm "<U0041><U004D>";"<U0050><U004D>" +t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ +<U0025><U0070>" date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" diff --git a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c index 7c21d88ef3..4e0001af91 100644 --- a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c +++ b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c @@ -61,5 +61,6 @@ __libc_pthread_init (ptr, reclaim, functions) libc_freeres_fn (freeres_libptread) { - __libc_pthread_functions.ptr_freeres (); + if (__libc_pthread_functions.ptr_freeres != NULL) + __libc_pthread_functions.ptr_freeres (); } diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h index 96f26d5482..b08aef2f6c 100644 --- a/posix/bits/unistd.h +++ b/posix/bits/unistd.h @@ -198,7 +198,7 @@ __NTH (ttyname_r (int __fd, char *__buf, size_t __buflen)) } -#if defined __USE_REENTRANT || defined __USE_UNIX98 +#if defined __USE_REENTRANT || defined __USE_POSIX199506 extern int __getlogin_r_chk (char *__buf, size_t __buflen, size_t __nreal) __nonnull ((1)); extern int __REDIRECT (__getlogin_r_alias, (char *__buf, size_t __buflen), diff --git a/posix/unistd.h b/posix/unistd.h index c7a52722ca..b751928b1e 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -811,7 +811,7 @@ extern int tcsetpgrp (int __fd, __pid_t __pgrp_id) __THROW; This function is a possible cancellation points and therefore not marked with __THROW. */ extern char *getlogin (void); -#if defined __USE_REENTRANT || defined __USE_UNIX98 +#if defined __USE_REENTRANT || defined __USE_POSIX199506 /* Return at most NAME_LEN characters of the login name of the user in NAME. If it cannot be determined or some other error occurred, return the error code. Otherwise return 0. |