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/mbrtowc.m4 | |
| parent | cb26e97a88e90d04e6d4efe3de0de92dea53d1e5 (diff) | |
Use Gnulib's `nproc'.
This updates Gnulib to v0.0-4496-g6491120.
* m4/gnulib-cache.m4: Add `nproc'.
Diffstat (limited to 'm4/mbrtowc.m4')
| -rw-r--r-- | m4/mbrtowc.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 28b9c43bf..1de9aab32 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,4 +1,4 @@ -# mbrtowc.m4 serial 18 +# mbrtowc.m4 serial 19 dnl Copyright (C) 2001-2002, 2004-2005, 2008-2010 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -271,6 +271,7 @@ changequote([,])dnl #include <wchar.h> int main () { + int result = 0; /* This fails on Solaris. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { @@ -283,7 +284,7 @@ int main () { input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 1) - return 1; + result |= 1; } } /* This fails on HP-UX 11.11. */ @@ -298,10 +299,10 @@ int main () { input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 2) - return 1; + result |= 2; } } - return 0; + return result; }]])], [gl_cv_func_mbrtowc_retval=yes], [gl_cv_func_mbrtowc_retval=no], |