diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-12 01:14:45 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-12 01:15:37 -0700 |
commit | faf5fbeb360a17d3d3407bf58a39706e4ce12642 (patch) | |
tree | 157963cc68a2536597d59b7a2869010642177edf | |
parent | 4a1527908b992f721fc99991b0e89d8d355f924c (diff) | |
download | coreutils-faf5fbeb360a17d3d3407bf58a39706e4ce12642.tar.xz |
pathchk: port to hosts where mbstate_t is replaced
This problem was discovered when trying to build git coreutils on
Solaris 8 sparcv9 with Sun C 5.8: the 3rd argument to mbrlen was
of type int * (a pointer to the gnulib replacement mbstate_t) but
the system mbrlen wants the system mbstate_t *.
* bootstrap.conf (gnulib_modules): Add mbrlen.
* src/pathchk.c (mbrlen, mbstate_t) [!(HAVE_MBRLEN && HAVE_MBSTATE_T)]:
Remove macros, which are wrong now that gnulib supplies
replacements for mbstate_t and mbrlen.
-rw-r--r-- | bootstrap.conf | 1 | ||||
-rw-r--r-- | src/pathchk.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 964b0be47..820cb54d1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -139,6 +139,7 @@ gnulib_modules=" maintainer-makefile malloc-gnu manywarnings + mbrlen mbrtowc mbsalign mbswidth diff --git a/src/pathchk.c b/src/pathchk.c index 814652834..463269690 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -25,11 +25,6 @@ #include "quote.h" #include "quotearg.h" -#if ! (HAVE_MBRLEN && HAVE_MBSTATE_T) -# define mbrlen(s, n, ps) 1 -# define mbstate_t int -#endif - /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pathchk" |