Paul Eggert <egg...@cs.ucla.edu> writes:
> +# if (!defined LDAV_DONE \
> + && (defined __ANDROID__ ? 13 <= __ANDROID_API__ : __defined __linux__))
> + /* non-Android Linux without glibc, Android 3.2+, Cygwin
> */
Small typo here caused by Haiku build to fail like so:
getloadavg.c: In function 'getloadavg':
getloadavg.c:503:67: error: missing binary operator before token "__linux__"
503 | && (defined __ANDROID__ ? 13 <= __ANDROID_API__ : __defined
__linux__))
|
I have pushed the attached patch to fix it.
Collin
>From d3d50d47e15b597f8a9a804bf81877bf842c60af Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Mon, 21 Apr 2025 20:08:30 -0700
Subject: [PATCH] getloadavg: Fix typo in previous commit.
* lib/getloadavg.c (getloadavg): Remove '__' prefix from 'defined'.
---
ChangeLog | 5 +++++
lib/getloadavg.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 6993f2d9b3..69b6fd7a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2025-04-21 Collin Funk <collin.fu...@gmail.com>
+
+ getloadavg: Fix typo in previous commit.
+ * lib/getloadavg.c (getloadavg): Remove '__' prefix from 'defined'.
+
2025-04-21 Paul Eggert <egg...@cs.ucla.edu>
getloadavg: port to Android 3.1-
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 5b21ed525c..b4fb169182 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -500,7 +500,7 @@ getloadavg (double loadavg[], int nelem)
# endif
# if (!defined LDAV_DONE \
- && (defined __ANDROID__ ? 13 <= __ANDROID_API__ : __defined __linux__))
+ && (defined __ANDROID__ ? 13 <= __ANDROID_API__ : defined __linux__))
/* non-Android Linux without glibc, Android 3.2+, Cygwin */
# define LDAV_DONE
# undef LOAD_AVE_TYPE
--
2.49.0
