diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:22:28 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:18 +0100 |
| commit | 39eda5d0b1b3d1df691102b311868ef4ce69d221 (patch) | |
| tree | 656b04c15b8ca6f7c2d7fa567f0725d024d0c445 /m4/unistd_h.m4 | |
| parent | a1e2c8310d3694d3a80201ea63371e33a58d2d2a (diff) | |
| download | gnulib-39eda5d0b1b3d1df691102b311868ef4ce69d221.tar.gz | |
Resolve conflicts for functions introduced in Android API level 28.
* lib/unistd.in.h (getentropy): Consider REPLACE_GETENTROPY. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize REPLACE_GETENTROPY.
* modules/unistd (Makefile.am): Substitute REPLACE_GETENTROPY.
* m4/getentropy.m4 (gl_FUNC_GETENTROPY): Conditionally set
REPLACE_GETENTROPY.
* modules/getentropy (Depends-on, configure.ac): Consider
REPLACE_GETENTROPY.
Diffstat (limited to 'm4/unistd_h.m4')
| -rw-r--r-- | m4/unistd_h.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index fc8e2a58f3..1c96158155 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 93 +# unistd_h.m4 serial 94 dnl Copyright (C) 2006-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, @@ -240,6 +240,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME]) REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE]) + REPLACE_GETENTROPY=0; AC_SUBST([REPLACE_GETENTROPY]) REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) |