]> Savannah Git Hosting - gnulib.git/commitdiff
Resolve conflicts for functions introduced in Android API level 12.
authorBruno Haible <bruno@clisp.org>
Sun, 22 Jan 2023 00:36:31 +0000 (01:36 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 22 Jan 2023 14:56:00 +0000 (15:56 +0100)
* m4/pread.m4 (gl_FUNC_PREAD): Conditionally set REPLACE_PREAD.
* lib/unistd.in.h (pread): Disable _GL_CXXALIASWARN invocation on
non-glibc systems.

ChangeLog
lib/unistd.in.h
m4/pread.m4

index badff3bc76e2608686ca2903413ed0c48db19be0..0ff8954a34bc1cb000013ede2aad99f9c0fd768d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        Resolve conflicts for functions introduced in Android API level 12.
 
+       * m4/pread.m4 (gl_FUNC_PREAD): Conditionally set REPLACE_PREAD.
+       * lib/unistd.in.h (pread): Disable _GL_CXXALIASWARN invocation on
+       non-glibc systems.
+
        * m4/ftruncate.m4 (gl_FUNC_FTRUNCATE): Conditionally set
        REPLACE_FTRUNCATE.
        * lib/unistd.in.h (ftruncate): Disable _GL_CXXALIASWARN invocation on
index 349a0c3f80fdffbdd42a67f50ef8713a0c1b5201..d625b81cad3b1f7af264aead4de9dde751a1ee97 100644 (file)
@@ -1803,7 +1803,9 @@ _GL_FUNCDECL_SYS (pread, ssize_t,
 _GL_CXXALIAS_SYS (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pread);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pread
 # if HAVE_RAW_DECL_PREAD
index 8031f910d45f2071ab836be8d4e81f24830ecbb7..2c60e7c70f18491dd508e987e6bd916865761d48 100644 (file)
@@ -1,4 +1,4 @@
-# pread.m4 serial 7
+# pread.m4 serial 8
 dnl Copyright (C) 2009-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,
@@ -81,5 +81,8 @@ changequote([,])dnl
     esac
   else
     HAVE_PREAD=0
+    case "$gl_cv_onwards_func_pread" in
+      future*) REPLACE_PREAD=1 ;;
+    esac
   fi
 ])