Mercurial > hg > octave-kai > gnulib-hg
changeset 13509:a7655f9a621f
duplocale: Work around AIX 7.1 bug.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 31 Jul 2010 11:45:41 +0200 |
parents | abc6ebd285a3 |
children | f8e55a0771f7 |
files | ChangeLog doc/posix-functions/duplocale.texi lib/duplocale.c m4/duplocale.m4 |
diffstat | 4 files changed, 30 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-07-31 Bruno Haible <bruno@clisp.org> + + duplocale: Work around AIX 7.1 bug. + * m4/duplocale.m4 (gl_FUNC_DUPLOCALE): Let the test fail also when + duplocale(LC_GLOBAL_LOCALE) returns (locale_t)0. + * lib/duplocale.c (rpl_duplocale): Update comment. + * doc/posix-functions/duplocale.texi: Mention the AIX 7.1 bug. + Reported by Rainer Tammer. + 2010-07-30 Bruno Haible <bruno@clisp.org> dirfd: Avoid link error on AIX 7.1.
--- a/doc/posix-functions/duplocale.texi +++ b/doc/posix-functions/duplocale.texi @@ -10,7 +10,7 @@ @itemize @item The argument @code{LC_GLOBAL_LOCALE} is not supported on some platforms: -glibc 2.11. +glibc 2.11, AIX 7.1. @end itemize Portability problems not fixed by Gnulib:
--- a/lib/duplocale.c +++ b/lib/duplocale.c @@ -32,7 +32,9 @@ rpl_duplocale (locale_t locale) { /* Work around crash in the duplocale function in glibc < 2.12. - See <http://sourceware.org/bugzilla/show_bug.cgi?id=10969>. */ + See <http://sourceware.org/bugzilla/show_bug.cgi?id=10969>. + Also, on AIX 7.1, duplocale(LC_GLOBAL_LOCALE) returns (locale_t)0 with + errno set to EINVAL. */ if (locale == LC_GLOBAL_LOCALE) { /* Create a copy of the locale by fetching the name of each locale
--- a/m4/duplocale.m4 +++ b/m4/duplocale.m4 @@ -1,5 +1,5 @@ -# duplocale.m4 serial 2 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# duplocale.m4 serial 3 +dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,6 +12,8 @@ if test $ac_cv_func_duplocale = yes; then dnl Check against glibc bug where duplocale crashes. dnl See <http://sourceware.org/bugzilla/show_bug.cgi?id=10969>. + dnl Also, on AIX 7.1, duplocale(LC_GLOBAL_LOCALE) returns (locale_t)0 with + dnl errno set to EINVAL. AC_REQUIRE([gl_LOCALE_H]) AC_CACHE_CHECK([whether duplocale(LC_GLOBAL_LOCALE) works], [gl_cv_func_duplocale_works], @@ -22,20 +24,27 @@ #endif int main () { - (void) duplocale (LC_GLOBAL_LOCALE); + if (duplocale (LC_GLOBAL_LOCALE) == (locale_t)0) + return 1; return 0; }], [gl_cv_func_duplocale_works=yes], [gl_cv_func_duplocale_works=no], - [dnl Guess it works except on glibc < 2.12. - AC_EGREP_CPP([Unlucky GNU user], [ + [dnl Guess it works except on glibc < 2.12 and AIX. + case "$host_os" in + aix*) gl_cv_func_duplocale_works="guessing no";; + *-gnu*) + AC_EGREP_CPP([Unlucky GNU user], [ #include <features.h> #ifdef __GNU_LIBRARY__ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12) Unlucky GNU user #endif #endif - ], - [gl_cv_func_duplocale_works="guessing no"], - [gl_cv_func_duplocale_works="guessing yes"]) + ], + [gl_cv_func_duplocale_works="guessing no"], + [gl_cv_func_duplocale_works="guessing yes"]) + ;; + *) gl_cv_func_duplocale_works="guessing yes";; + esac ]) ]) case "$gl_cv_func_duplocale_works" in