Fix build with Bionic 7.x
Change-Id: I98a495a9b6750f1ff33b7a6c4c875481e2698070
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/cpuidle/cpuidle_killer.c b/cpuidle/cpuidle_killer.c
index e0e81e8..6326afb 100644
--- a/cpuidle/cpuidle_killer.c
+++ b/cpuidle/cpuidle_killer.c
@@ -6,16 +6,19 @@
#include <sys/time.h>
#ifdef ANDROID
/*
-* As of 5.0.0, Bionic provides timex, but not the
+* Bionic prior to 7.0.0 provides timex, but not the
* adjtimex interface.
-* However, the kernel does.
+* Bionic 7.0.0 adds adjtimex, but there's no define
+* to check for it, so we rename and #define our
+* version to not get a symbol clash.
*/
#include <linux/timex.h> /* for struct timex */
#include <asm/unistd.h> /* for __NR_adjtimex */
-static int adjtimex(struct timex *buf)
+static int adj_timex(struct timex *buf)
{
return syscall(__NR_adjtimex, buf);
}
+#define adjtimex adj_timex
#endif
#include <sys/types.h>
#include <sys/wait.h>