From 134320a310c64fc3b497618cabc2749bd98735fb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 Jan 2023 13:05:19 +0100 Subject: Resolve conflicts for functions introduced in Android API level 23. * lib/unistd.in.h (sethostname): Consider REPLACE_SETHOSTNAME. Disable _GL_CXXALIASWARN invocation on non-glibc systems. * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize REPLACE_SETHOSTNAME. * modules/unistd (Makefile.am): Substitute REPLACE_SETHOSTNAME. * m4/sethostname.m4 (gl_FUNC_SETHOSTNAME): Conditionally set REPLACE_SETHOSTNAME. * modules/sethostname (Depends-on, configure.ac): Consider REPLACE_SETHOSTNAME. --- m4/unistd_h.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'm4/unistd_h.m4') diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 8fbd82b2b7..fc8e2a58f3 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 92 +# unistd_h.m4 serial 93 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, @@ -257,6 +257,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) + REPLACE_SETHOSTNAME=0; AC_SUBST([REPLACE_SETHOSTNAME]) REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) -- cgit v1.2.1