diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-12-07 21:43:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-12-07 23:13:19 +0100 |
| commit | 0f00f2c33a85842a9611ed63f07e915ea9fd60de (patch) | |
| tree | a02ec2b230021798eb854693c6c9270c6a1f87e6 /m4/locale-zh.m4 | |
| parent | cb26e97a88e90d04e6d4efe3de0de92dea53d1e5 (diff) | |
| download | guile-0f00f2c33a85842a9611ed63f07e915ea9fd60de.tar.gz | |
Use Gnulib's `nproc'.
This updates Gnulib to v0.0-4496-g6491120.
* m4/gnulib-cache.m4: Add `nproc'.
Diffstat (limited to 'm4/locale-zh.m4')
| -rw-r--r-- | m4/locale-zh.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 777fd1418..be176c15e 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,4 +1,4 @@ -# locale-zh.m4 serial 6 +# locale-zh.m4 serial 7 dnl Copyright (C) 2003, 2005-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, @@ -34,11 +34,14 @@ int main () is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. */ + some unit tests fail. + On MirBSD 10, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "UTF-8". */ #if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 + || strcmp (cs, "UTF-8") == 0) return 1; } #endif @@ -49,7 +52,7 @@ int main () if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; #endif /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. - This excludes the UTF-8 encoding. */ + This excludes the UTF-8 encoding (except on MirBSD). */ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; for (p = buf; *p != '\0'; p++) |