diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-03-06 14:36:38 +0100 |
|---|---|---|
| committer | Lisa Nguyen <lisa.nguyen@linaro.org> | 2015-03-06 11:26:38 -0800 |
| commit | 776d64b52b2caba12220b2f81e6d1f3c17b56a30 (patch) | |
| tree | 8a670c60c06d1faa66122e46b9766d0d88ea00c1 | |
| parent | 8ed83914ce9e0c9e50bd267b474dfb766745664f (diff) | |
Fix build with Bionic from AOSP master
Current Bionic (including 5.0.x releases) provides timex, but still
not adjtimex
Change-Id: Ice82b5ad98ad94ad8ea241f629944a9e988dffbc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | cpuidle/cpuidle_killer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpuidle/cpuidle_killer.c b/cpuidle/cpuidle_killer.c index 49fe1ea..4297c18 100644 --- a/cpuidle/cpuidle_killer.c +++ b/cpuidle/cpuidle_killer.c @@ -2,11 +2,12 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#ifndef ANDROID #include <sys/timex.h> -#else +#ifdef ANDROID /* -* As of 4.0.4, Bionic doesn't provide the timex/adjtimex interface However, the kernel does. +* As of 5.0.0, Bionic provides timex, but not the +* adjtimex interface. +* However, the kernel does. */ #include <linux/timex.h> /* for struct timex */ #include <asm/unistd.h> /* for __NR_adjtimex */ |