]> Savannah Git Hosting - gnulib.git/commitdiff
getloadavg: port to Android 3.1-
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 21 Apr 2025 17:58:58 +0000 (10:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 21 Apr 2025 18:00:06 +0000 (11:00 -0700)
Problem reported by Po Lu in:
https://lists.gnu.org/r/bug-gnulib/2025-04/msg00172.html
* lib/getloadavg.c (getloadavg): Do not try to use sysinfo on
Android 3.1 Honeycomb (API 12, 2011) and earlier.

ChangeLog
lib/getloadavg.c

index 2d3705be93dded878ec92217350bc70548d30fff..6993f2d9b3a763d63b55e8b1dcd79e5f33ca9877 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2025-04-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       getloadavg: port to Android 3.1-
+       Problem reported by Po Lu in:
+       https://lists.gnu.org/r/bug-gnulib/2025-04/msg00172.html
+       * lib/getloadavg.c (getloadavg): Do not try to use sysinfo on
+       Android 3.1 Honeycomb (API 12, 2011) and earlier.
+
 2025-04-19  Bruno Haible  <bruno@clisp.org>
 
        Update users.txt.
index 9da41c16c028c5bc46b96357d7f70bec0f234bd1..5b21ed525cb8103c964497dedb5285a47eb84385 100644 (file)
@@ -499,8 +499,9 @@ getloadavg (double loadavg[], int nelem)
   }
 # endif
 
-# if !defined (LDAV_DONE) && (defined __linux__ || defined __ANDROID__)
-                                      /* Linux without glibc, Android, Cygwin */
+# if (!defined LDAV_DONE \
+      && (defined __ANDROID__ ? 13 <= __ANDROID_API__ : __defined __linux__))
+                    /* non-Android Linux without glibc, Android 3.2+, Cygwin */
 #  define LDAV_DONE
 #  undef LOAD_AVE_TYPE
 
@@ -513,7 +514,7 @@ getloadavg (double loadavg[], int nelem)
     loadavg[2] = info.loads[2] / (double)(1U << SI_LOAD_SHIFT);
     elem = 3;
   }
-# endif /* __linux__ || __ANDROID__ */
+# endif /* __ANDROID__ ? 13 <= __ANDROID_API__ : __linux__ */
 
 # if !defined (LDAV_DONE) && defined __CYGWIN__
                                       /* Cygwin */