qsort_r: Port to Android API level 36.

* m4/qsort_r.m4 (gl_FUNC_QSORT_R): Use gl_CHECK_FUNCS_ANDROID to check
for qsort_r instead of AC_CHECK_FUNCS_ONCE.
* doc/glibc-functions/qsort_r.texi: Document that the function is
missing on Android API 35 and lower.

diff --git a/ChangeLog b/ChangeLog
index 348009ed5a5cd55e5c7a1f5361670bd07de890d5..54414de58cbe2bdd44b9ade3fb536474e7e64543 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
 2025-09-20  Collin Funk  <collin.funk1@gmail.com>
 
+       qsort_r: Port to Android API level 36.
+       * m4/qsort_r.m4 (gl_FUNC_QSORT_R): Use gl_CHECK_FUNCS_ANDROID to check
+       for qsort_r instead of AC_CHECK_FUNCS_ONCE.
+       * doc/glibc-functions/qsort_r.texi: Document that the function is
+       missing on Android API 35 and lower.
+
        lchmod: Port to Android API level 36.
        * m4/lchmod.m4 (gl_FUNC_LCHMOD): Use gl_CHECK_FUNCS_ANDROID to check for
        lchmod instead of AC_CHECK_FUNCS_ONCE.
        * m4/lchown.m4 (gl_FUNC_LCHOWN): Likewise.
-       * doc/glibc-functions/lchmod.texi (lchmod): Document that the function
-       is missing on Android API 35 and lower.
+       * doc/glibc-functions/lchmod.texi: Document that the function is missing
+       on Android API 35 and lower.
 
 2025-09-20  Bruno Haible  <bruno@clisp.org>
 

diff --git a/doc/posix-functions/qsort_r.texi b/doc/posix-functions/qsort_r.texi
index 98248ec2330ef0b563d678e1d85af1ff0ba419ed..e4a62b3818f4301fe0045f0ed111bab77d9b1dac 100644 (file)
--- a/doc/posix-functions/qsort_r.texi
+++ b/doc/posix-functions/qsort_r.texi
@@ -13,7 +13,7 @@ Portability problems fixed by Gnulib:
 @itemize
 @item
 This function is missing on some platforms:
-glibc 2.7, NetBSD 10.0, OpenBSD 7.5, Minix 3.1.8, AIX 7.1, HP-UX 11.31, Solaris 11.4, Cygwin 1.7.x, mingw, MSVC 14, Android 9.0.
+glibc 2.7, NetBSD 10.0, OpenBSD 7.5, Minix 3.1.8, AIX 7.1, HP-UX 11.31, Solaris 11.4, Cygwin 1.7.x, mingw, MSVC 14, Android API level 35.
 @item
 This function has an incompatible API on some platforms:
 FreeBSD 13.4.

diff --git a/m4/qsort_r.m4 b/m4/qsort_r.m4
index b460198196447df1f4341ffb716bd73e7e677418..82fd96436797d39f2123842c9664ff175d0b324a 100644 (file)
--- a/m4/qsort_r.m4
+++ b/m4/qsort_r.m4
@@ -1,5 +1,5 @@
 # qsort_r.m4
-# serial 1
+# serial 2
 dnl Copyright 2014-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_QSORT_R],
 
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
 
-  AC_CHECK_FUNCS_ONCE([qsort_r])
+  gl_CHECK_FUNCS_ANDROID([qsort_r], [[#include <stdlib.h>]])
   if test $ac_cv_func_qsort_r = yes; then
     AC_CACHE_CHECK([for qsort_r signature], [gl_cv_qsort_r_signature],
       [AC_LINK_IFELSE(