diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 12:22:31 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:35 +0100 |
| commit | 3dfb81922f3c40795b047c4305cfa28cd60c3269 (patch) | |
| tree | c650cb837d9b7e46293655c6688ab4a4800d80b9 /m4 | |
| parent | 40135ed721447d3fc5c423d42c47f8aaa65bb8c6 (diff) | |
| download | gnulib-3dfb81922f3c40795b047c4305cfa28cd60c3269.tar.gz | |
Resolve conflicts for functions introduced in Android API level 21.
* m4/dprintf.m4 (gl_REPLACE_DPRINTF): Conditionally set REPLACE_DPRINTF.
* lib/stdio.in.h (dprintf): Disable _GL_CXXALIASWARN invocation on
non-glibc systems.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/dprintf.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/dprintf.m4 b/m4/dprintf.m4 index 54c186620b..1ffed0d627 100644 --- a/m4/dprintf.m4 +++ b/m4/dprintf.m4 @@ -1,4 +1,4 @@ -# dprintf.m4 serial 2 +# dprintf.m4 serial 3 dnl Copyright (C) 2009-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, @@ -18,7 +18,11 @@ AC_DEFUN([gl_REPLACE_DPRINTF], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_LIBOBJ([dprintf]) - if test $ac_cv_func_dprintf = yes; then + if test $ac_cv_func_dprintf = yes \ + || case "$gl_cv_onwards_func_dprintf" in \ + future*) true ;; \ + *) false ;; \ + esac; then REPLACE_DPRINTF=1 fi gl_PREREQ_DPRINTF |