diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-14 21:16:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-14 21:16:47 (GMT) |
| commit | 0402697c06368b81ad344885e95cc90ecb28b44b (patch) | |
| tree | 610e9b6cd573f480b221ba17fe9de5aa4544f8f7 /Utilities | |
| parent | ea55b3e657ba4debd7a2ed17225052d3cde6283d (diff) | |
| parent | ca7790240cf63cd6f449cbde2d8b9866bd22c7d8 (diff) | |
| download | CMake-0402697c06368b81ad344885e95cc90ecb28b44b.zip CMake-0402697c06368b81ad344885e95cc90ecb28b44b.tar.gz CMake-0402697c06368b81ad344885e95cc90ecb28b44b.tar.bz2 | |
Merge topic 'libarchive-old-glibc'
ca77902 libarchive: Workaround mbsnrtowcs assertion failure on old glibc
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_platform.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_platform.h b/Utilities/cmlibarchive/libarchive/archive_platform.h index ce2f482..cdd9c7c 100644 --- a/Utilities/cmlibarchive/libarchive/archive_platform.h +++ b/Utilities/cmlibarchive/libarchive/archive_platform.h @@ -76,6 +76,11 @@ #define __FBSDID(a) struct _undefined_hack #endif +/* Old glibc mbsnrtowcs fails assertions in our use case. */ +#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1 +# undef HAVE_MBSNRTOWCS +#endif + /* Try to get standard C99-style integer type definitions. */ #if HAVE_INTTYPES_H #include <inttypes.h> |