diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:47:09 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:31 +0100 |
| commit | d81d019c306caa907f8d7e978072a3bdac2c7713 (patch) | |
| tree | 2d2d7dd04c225a15a11ebb2208819de7c9808759 /modules/getloadavg | |
| parent | 2eaaeea01ce0ad1bead7ffe8bfbe10f06fa8c9d2 (diff) | |
| download | gnulib-d81d019c306caa907f8d7e978072a3bdac2c7713.tar.gz | |
Resolve conflicts for functions introduced in Android API level 29.
* lib/stdlib.in.h (getloadavg): Consider REPLACE_GETLOADAVG. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE_GETLOADAVG.
* modules/stdlib (Makefile.am): Substitute REPLACE_GETLOADAVG.
* m4/getloadavg.m4 (gl_GETLOADAVG): Conditionally set
REPLACE_GETLOADAVG.
* modules/getloadavg (Depends-on, configure.ac): Consider
REPLACE_GETLOADAVG.
Diffstat (limited to 'modules/getloadavg')
| -rw-r--r-- | modules/getloadavg | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/getloadavg b/modules/getloadavg index 9a5553ebba..fcd4352d28 100644 --- a/modules/getloadavg +++ b/modules/getloadavg @@ -7,15 +7,16 @@ m4/getloadavg.m4 Depends-on: extensions -intprops [test $HAVE_GETLOADAVG = 0] -open [case $host_os in mingw*) false;; *) test $HAVE_GETLOADAVG = 0;; esac] -stdbool [test $HAVE_GETLOADAVG = 0] -stdlib [test $HAVE_GETLOADAVG = 0] +intprops [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1] +open [case $host_os in mingw*) false;; *) test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1;; esac] +stdbool [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1] +stdlib [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1] configure.ac: AC_REQUIRE([AC_CANONICAL_HOST]) gl_GETLOADAVG -gl_CONDITIONAL([GL_COND_OBJ_GETLOADAVG], [test $HAVE_GETLOADAVG = 0]) +gl_CONDITIONAL([GL_COND_OBJ_GETLOADAVG], + [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1]) AM_COND_IF([GL_COND_OBJ_GETLOADAVG], [ gl_PREREQ_GETLOADAVG ]) |