diff options
| author | Stephen Hines <srhines@google.com> | 2013-08-15 10:02:11 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-08-15 10:05:41 -0700 |
| commit | 43cfc0cbe6e6e8f585a0ae5f1d9cc2859ab1dda7 (patch) | |
| tree | 6368e668671896264c40d8c1418ba4d070823456 | |
| parent | 6dfe6841d357a1664433f0dcec3c8f4ae8ffbeb0 (diff) | |
| download | rs-43cfc0cbe6e6e8f585a0ae5f1d9cc2859ab1dda7.tar.gz | |
Remove barriers to using NDK v8 includes.
Bug: 10315692
Removed CLOCK_BOOTTIME, added some additional guards around cutils includes,
and explicitly included errno.h when we use ETIMEDOUT.
Change-Id: I0a764beea2f8ff7387a9afe985f00b5f03c68725
| -rw-r--r-- | cpu_ref/rsCpuRuntimeMath.cpp | 2 | ||||
| -rw-r--r-- | rsCppUtils.h | 4 | ||||
| -rw-r--r-- | rsSignal.cpp | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cpu_ref/rsCpuRuntimeMath.cpp b/cpu_ref/rsCpuRuntimeMath.cpp index c80111ab..0aaadd44 100644 --- a/cpu_ref/rsCpuRuntimeMath.cpp +++ b/cpu_ref/rsCpuRuntimeMath.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#ifndef RS_SERVER +#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) #include <cutils/compiler.h> #endif diff --git a/rsCppUtils.h b/rsCppUtils.h index ced13c12..c1e72c28 100644 --- a/rsCppUtils.h +++ b/rsCppUtils.h @@ -148,7 +148,6 @@ enum { SYSTEM_TIME_MONOTONIC = 1, // monotonic time since unspecified starting point SYSTEM_TIME_PROCESS = 2, // high-resolution per-process clock SYSTEM_TIME_THREAD = 3, // high-resolution per-thread clock - SYSTEM_TIME_BOOTTIME = 4 // same as SYSTEM_TIME_MONOTONIC, but including CPU suspend time }; static inline nsecs_t systemTime(int clock) @@ -158,8 +157,7 @@ static inline nsecs_t systemTime(int clock) CLOCK_REALTIME, CLOCK_MONOTONIC, CLOCK_PROCESS_CPUTIME_ID, - CLOCK_THREAD_CPUTIME_ID, - CLOCK_BOOTTIME + CLOCK_THREAD_CPUTIME_ID }; struct timespec t; t.tv_sec = t.tv_nsec = 0; diff --git a/rsSignal.cpp b/rsSignal.cpp index c59b39e3..658c0b74 100644 --- a/rsSignal.cpp +++ b/rsSignal.cpp @@ -15,6 +15,7 @@ */ #include "rsSignal.h" +#include <errno.h> using namespace android; using namespace android::renderscript; |