]> 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:38:16 +0000 (01:38 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 22 Jan 2023 14:56:02 +0000 (15:56 +0100)
* m4/pwrite.m4 (gl_FUNC_PWRITE): Conditionally set REPLACE_PWRITE.
* lib/unistd.in.h (pwrite): Disable _GL_CXXALIASWARN invocation on
non-glibc systems.

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

index 0ff8954a34bc1cb000013ede2aad99f9c0fd768d..a9a774a37d7cefec2a28b8fbaeed45a8e835b2d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        Resolve conflicts for functions introduced in Android API level 12.
 
+       * m4/pwrite.m4 (gl_FUNC_PWRITE): Conditionally set REPLACE_PWRITE.
+       * lib/unistd.in.h (pwrite): Disable _GL_CXXALIASWARN invocation on
+       non-glibc systems.
+
        * m4/pread.m4 (gl_FUNC_PREAD): Conditionally set REPLACE_PREAD.
        * lib/unistd.in.h (pread): Disable _GL_CXXALIASWARN invocation on
        non-glibc systems.
index d625b81cad3b1f7af264aead4de9dde751a1ee97..bc69194fac523da79a4c6eeaf421d15a0ed70a14 100644 (file)
@@ -1840,7 +1840,9 @@ _GL_FUNCDECL_SYS (pwrite, ssize_t,
 _GL_CXXALIAS_SYS (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pwrite);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pwrite
 # if HAVE_RAW_DECL_PWRITE
index 48c5255f30bd37affabe0cde9ea2db1cec0e8b86..51051c1bc44564292436c6fa677e918c64505ab2 100644 (file)
@@ -1,4 +1,4 @@
-# pwrite.m4 serial 7
+# pwrite.m4 serial 8
 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,
@@ -95,5 +95,8 @@ changequote([,])dnl
     esac
   else
     HAVE_PWRITE=0
+    case "$gl_cv_onwards_func_pwrite" in
+      future*) REPLACE_PWRITE=1 ;;
+    esac
   fi
 ])