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 | |
| 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')
| -rw-r--r-- | modules/getloadavg | 11 | ||||
| -rw-r--r-- | modules/stdlib | 1 |
2 files changed, 7 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 ]) diff --git a/modules/stdlib b/modules/stdlib index 5ae3e6665d..bafeb214ee 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -134,6 +134,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ + -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \ -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \ -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ |