mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-03 10:53:23 +00:00
a84a934a44
* admin/gnulib-patches/lib/getloadavg.c.diff: New file. * admin/merge-gnulib (GNULIB_TOOL_FLAGS): Set --local-dir to admin/gnulib-patches. * lib/gnulib.mk.in: Update from Gnulib.
14 lines
539 B
Diff
14 lines
539 B
Diff
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
|
|
index 9da41c16c02..1cb1c01097d 100644
|
|
--- a/lib/getloadavg.c
|
|
+++ b/lib/getloadavg.c
|
|
@@ -499,7 +499,8 @@ getloadavg (double loadavg[], int nelem)
|
|
}
|
|
# endif
|
|
|
|
-# if !defined (LDAV_DONE) && (defined __linux__ || defined __ANDROID__)
|
|
+# if !defined (LDAV_DONE) && (defined __linux__ || defined __ANDROID__) \
|
|
+ && (!defined __ANDROID__ || __ANDROID_API__ >= 13)
|
|
/* Linux without glibc, Android, Cygwin */
|
|
# define LDAV_DONE
|
|
# undef LOAD_AVE_TYPE
|