diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-05 17:35:34 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-05 17:35:34 +0100 |
| commit | 6f6ca19e6cec9fec055258b1459108ef8822fe75 (patch) | |
| tree | 10df5fc8ad162eb2679f1543a546e4cdf6950a63 | |
| parent | 7ca7d7d7d7553f9d6f3484e53f24d10433f8fdcd (diff) | |
| download | gnulib-6f6ca19e6cec9fec055258b1459108ef8822fe75.tar.gz | |
string: Fix compilation errors in C++ mode on Android.
* lib/string.in.h (memrchr, strchrnul, strcasestr): Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/string.in.h | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2023-01-05 Bruno Haible <bruno@clisp.org> + string: Fix compilation errors in C++ mode on Android. + * lib/string.in.h (memrchr, strchrnul, strcasestr): Disable + _GL_CXXALIASWARN invocation on non-glibc systems. + +2023-01-05 Bruno Haible <bruno@clisp.org> + getpass: Fix compilation error on Android. * m4/getpass.m4 (gl_FUNC_GETPASS): Define NO_INLINE_GETPASS. * doc/glibc-functions/getpass.texi: Mention the Android problem. diff --git a/lib/string.in.h b/lib/string.in.h index b2683b6e4c..b227a17887 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -344,7 +344,7 @@ _GL_CXXALIAS_SYS_CAST2 (memrchr, || defined __clang__) _GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ()); _GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ()); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (memrchr); # endif #elif defined GNULIB_POSIXCHECK @@ -499,7 +499,7 @@ _GL_CXXALIAS_SYS_CAST2 (strchrnul, _GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ()); _GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in) throw ()); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strchrnul); # endif #elif defined GNULIB_POSIXCHECK @@ -864,7 +864,7 @@ _GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle) throw ()); _GL_CXXALIASWARN1 (strcasestr, const char *, (const char *haystack, const char *needle) throw ()); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strcasestr); # endif #elif defined GNULIB_POSIXCHECK |