From: Paul Eggert Date: Mon, 21 Apr 2025 17:58:58 +0000 (-0700) Subject: getloadavg: port to Android 3.1- X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=cd9859b6f5908f933d2db7ee92bcd1e0db9aac1f;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 2d3705be93..6993f2d9b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2025-04-21 Paul Eggert + + 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 Update users.txt. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 9da41c16c0..5b21ed525c 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -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 */