]> 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)
committerBruno Haible <bruno@clisp.org>
Sat, 3 May 2025 14:04:26 +0000 (16:04 +0200)
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 8486d4cf826a272e11b1355ebb600190e50f3ff2..a43dad16083c2b1982c9617def1a6888bb2c5b6a 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-16  Grisha Levit  <grishalevit@gmail.com>  (tiny change)
 
        Ensure that the configuration cleans up conftest.dSYM directories.
index 628fecf21cc53283588c28479aa3ad1172c39dfb..c2130932261c9f8f5454aacc4130f68d486922bd 100644 (file)
@@ -500,8 +500,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
 
@@ -514,7 +515,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 */