]> Savannah Git Hosting - gnulib.git/commitdiff
Resolve conflicts for functions introduced in Android API level 23.
authorBruno Haible <bruno@clisp.org>
Sun, 22 Jan 2023 13:14:42 +0000 (14:14 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 22 Jan 2023 14:57:07 +0000 (15:57 +0100)
* m4/login_tty.m4 (gl_FUNC_LOGIN_TTY): Conditionally set
REPLACE_LOGIN_TTY.
* lib/utmp.in.h (login_tty): Disable _GL_CXXALIASWARN invocation on
non-glibc systems.

ChangeLog
lib/utmp.in.h
m4/login_tty.m4

index 6b292af17860a2eb145498b165c8c52731831f47..0239e388cd1ca21140a2d7a833ae4b87f4bab0a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
        Resolve conflicts for functions introduced in Android API level 23.
 
+       * m4/login_tty.m4 (gl_FUNC_LOGIN_TTY): Conditionally set
+       REPLACE_LOGIN_TTY.
+       * lib/utmp.in.h (login_tty): Disable _GL_CXXALIASWARN invocation on
+       non-glibc systems.
+
        * m4/mkfifoat.m4 (gl_FUNC_MKFIFOAT): Conditionally set REPLACE_MKFIFOAT.
        * lib/sys_stat.in.h (mkfifoat): Disable _GL_CXXALIASWARN invocation on
        non-glibc systems.
index 58318e7ffb812748b31e8088b4791b62e9dec7ba..c33b3d24698888794e02472bd4ed4b759171e104 100644 (file)
@@ -62,7 +62,9 @@ _GL_FUNCDECL_SYS (login_tty, int, (int fd));
 #  endif
 _GL_CXXALIAS_SYS (login_tty, int, (int fd));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (login_tty);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef login_tty
 # if HAVE_RAW_DECL_LOGIN_TTY
index 0d504050f1d72dd1ca5e4de73036b149065ddcc4..ca15e6aabb29244f113f6583d55453c05e198425 100644 (file)
@@ -1,4 +1,4 @@
-# login_tty.m4 serial 1
+# login_tty.m4 serial 2
 dnl Copyright (C) 2010-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,
@@ -26,5 +26,8 @@ AC_DEFUN([gl_FUNC_LOGIN_TTY],
 
   if test $ac_cv_func_login_tty = no; then
     HAVE_LOGIN_TTY=0
+    case "$gl_cv_onwards_func_login_tty" in
+      future*) REPLACE_LOGIN_TTY=1 ;;
+    esac
   fi
 ])