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
This commit is contained in:
Kenny Root 2011-02-16 10:13:53 -08:00 committed by Alex Ray
parent ff49de731f
commit dafff0bcc1
2 changed files with 5 additions and 5 deletions

View File

@ -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) {

View File

@ -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