diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:09:49 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:00 +0100 |
| commit | eaf067b33e6883af540f72340400eabd9f79c029 (patch) | |
| tree | bb5b1afedfe355fb4fd840365bb49da86c8f2ed0 /lib | |
| parent | 6de13dcceb91445233d5d1e26c7498f826d2b8a2 (diff) | |
| download | gnulib-eaf067b33e6883af540f72340400eabd9f79c029.tar.gz | |
Resolve conflicts for functions introduced in Android API level 23.
* m4/error_h.m4 (gl_ERROR_H): Conditionally set REPLACE_ERROR.
* lib/error.in.h (error): Disable _GL_CXXALIASWARN invocation on
non-glibc systems.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/error.in.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/error.in.h b/lib/error.in.h index 2ac99c2817..bfddb011c0 100644 --- a/lib/error.in.h +++ b/lib/error.in.h @@ -56,7 +56,9 @@ _GL_FUNCDECL_SYS (error, void, _GL_CXXALIAS_SYS (error, void, (int __status, int __errnum, const char *__format, ...)); #endif +#if __GLIBC__ >= 2 _GL_CXXALIASWARN (error); +#endif /* Likewise. If FILENAME is non-NULL, include FILENAME:LINENO: in the message. */ |