diff options
| author | Bruno Haible <bruno@clisp.org> | 2012-01-21 14:39:02 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2012-01-21 19:59:02 +0100 |
| commit | 6f37b9dd8977f231e79d7a69277ed8a43af9625c (patch) | |
| tree | d073f5cdba47b9f1eb378b6da29f4004056c5d9a /m4/locale-fr.m4 | |
| parent | 2f1a477706b06256ddca33739a771e3d97d011f1 (diff) | |
| download | gnulib-6f37b9dd8977f231e79d7a69277ed8a43af9625c.tar.gz | |
locale-fr.m4: Fix for Android.
* m4/locale-fr.m4 (gt_LOCALE_FR, gt_LOCALE_FR_UTF8): Avoid compilation
failure of the test program on Bionic libc.
Diffstat (limited to 'm4/locale-fr.m4')
| -rw-r--r-- | m4/locale-fr.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 4cb14b5f5d..11056b8cc6 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,4 +1,4 @@ -# locale-fr.m4 serial 14 +# locale-fr.m4 serial 15 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -63,10 +63,12 @@ int main () { one byte long. This excludes the UTF-8 encoding. */ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1; +#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ /* Check whether the decimal separator is a comma. On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point are nl_langinfo(RADIXCHAR) are both ".". */ if (localeconv () ->decimal_point[0] != ',') return 1; +#endif return 0; } changequote([,])dnl @@ -189,10 +191,12 @@ int main () { || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') return 1; #endif +#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ /* Check whether the decimal separator is a comma. On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point are nl_langinfo(RADIXCHAR) are both ".". */ if (localeconv () ->decimal_point[0] != ',') return 1; +#endif return 0; } changequote([,])dnl |