diff options
| author | Kenny Root <kroot@google.com> | 2011-02-16 10:13:53 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-02-16 10:56:32 -0800 |
| commit | bb9d394b21bdfeb1ceb4cf6e4ed0306e39757b15 (patch) | |
| tree | dbe7d5b2eef96e80ed4a3a1595e1a26cb19e228d /libs/utils | |
| parent | 9497144281b92dd5293ea734d668217bcf4e86e9 (diff) | |
| download | frameworks_base-bb9d394b21bdfeb1ceb4cf6e4ed0306e39757b15.zip frameworks_base-bb9d394b21bdfeb1ceb4cf6e4ed0306e39757b15.tar.gz frameworks_base-bb9d394b21bdfeb1ceb4cf6e4ed0306e39757b15.tar.bz2 | |
Clean up use of HAVE_ANDROID_OS
HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches
all the other uses of HAVE_ANDROID_OS throughout the system.
Change-Id: I82257325a8ae5e4e4371ddfc4dbf51cea8ea0abb
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/SystemClock.cpp | 8 | ||||
| -rw-r--r-- | libs/utils/Threads.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/utils/SystemClock.cpp b/libs/utils/SystemClock.cpp index 2bdc0ce..062e6d7 100644 --- a/libs/utils/SystemClock.cpp +++ b/libs/utils/SystemClock.cpp @@ -19,7 +19,7 @@ * System clock functions. */ -#if HAVE_ANDROID_OS +#ifdef HAVE_ANDROID_OS #include <linux/ioctl.h> #include <linux/rtc.h> #include <utils/Atomic.h> @@ -50,7 +50,7 @@ int setCurrentTimeMillis(int64_t millis) return -1; #else struct timeval tv; -#if HAVE_ANDROID_OS +#ifdef HAVE_ANDROID_OS struct timespec ts; int fd; int res; @@ -66,7 +66,7 @@ int setCurrentTimeMillis(int64_t millis) LOGD("Setting time of day to sec=%d\n", (int) tv.tv_sec); -#if HAVE_ANDROID_OS +#ifdef HAVE_ANDROID_OS fd = open("/dev/alarm", O_RDWR); if(fd < 0) { LOGW("Unable to open alarm driver: %s\n", strerror(errno)); @@ -106,7 +106,7 @@ int64_t uptimeMillis() */ int64_t elapsedRealtime() { -#if HAVE_ANDROID_OS +#ifdef HAVE_ANDROID_OS static int s_fd = -1; if (s_fd == -1) { diff --git a/libs/utils/Threads.cpp b/libs/utils/Threads.cpp index b1bd828..35dcbcb 100644 --- a/libs/utils/Threads.cpp +++ b/libs/utils/Threads.cpp @@ -739,7 +739,7 @@ int Thread::_threadLoop(void* user) wp<Thread> weak(strong); self->mHoldSelf.clear(); -#if HAVE_ANDROID_OS +#ifdef HAVE_ANDROID_OS // this is very useful for debugging with gdb self->mTid = gettid(); #endif |