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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/error_h.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/error_h.m4 b/m4/error_h.m4 index bb8f68ff81..15b5112309 100644 --- a/m4/error_h.m4 +++ b/m4/error_h.m4 @@ -1,4 +1,4 @@ -# error_h.m4 serial 1 +# error_h.m4 serial 2 dnl Copyright (C) 1996-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,13 +11,17 @@ AC_DEFUN_ONCE([gl_ERROR_H], [ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + REPLACE_ERROR=0 + gl_CHECK_FUNCS_ANDROID([error], [[#include <error.h>]]) if test $ac_cv_func_error = yes; then HAVE_ERROR=1 else HAVE_ERROR=0 + case "$gl_cv_onwards_func_error" in + future*) REPLACE_ERROR=1 ;; + esac fi - REPLACE_ERROR=0 dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer dnl maintained in Autoconf and because it invokes AC_LIBOBJ. |