Cleanup in //runtime/bin

runtime/bin/thread_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "bin/thread.h"
+#include "bin/thread_android.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/time.h>  // NOLINT
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 
 namespace dart {
 namespace bin {
 
@@ skipping 11 matching lines @@
   if (result != 0) { \
     const int kBufferSize = 1024; \
     char error_message[kBufferSize]; \
     Utils::StrError(result, error_message, kBufferSize); \
     fprintf(stderr, "%s:%d: pthread error: %d (%s)\n", \
             __FILE__, __LINE__, result, error_message); \
     return result; \
   }
 #else
 #define RETURN_ON_PTHREAD_FAILURE(result) \
-  if (result != 0) return result;
+  if (result != 0) { \
+    return result; \
+  }
 #endif
 
 
 static void ComputeTimeSpecMicros(struct timespec* ts, int64_t micros) {
   struct timeval tv;
   int64_t secs = micros / kMicrosecondsPerSecond;
   int64_t remaining_micros = (micros - (secs * kMicrosecondsPerSecond));
   int result = gettimeofday(&tv, NULL);
   ASSERT(result == 0);
   ts->tv_sec = tv.tv_sec + secs;
@@ skipping 106 matching lines @@
 }
 
 
 intptr_t Thread::ThreadIdToIntPtr(ThreadId id) {
   ASSERT(sizeof(id) == sizeof(intptr_t));
   return static_cast<intptr_t>(id);
 }
 
 
 bool Thread::Compare(ThreadId a, ThreadId b) {
-  return a == b;
+  return (a == b);
 }
 
 
 void Thread::GetThreadCpuUsage(ThreadId thread_id, int64_t* cpu_usage) {
   ASSERT(thread_id == GetCurrentThreadId());
   ASSERT(cpu_usage != NULL);
   struct timespec ts;
   int r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
   ASSERT(r == 0);
   *cpu_usage = (ts.tv_sec * kNanosecondsPerSecond + ts.tv_nsec) /
@@ skipping 148 matching lines @@
 void Monitor::NotifyAll() {
   // TODO(iposva): Do we need to track lock owners?
   int result = pthread_cond_broadcast(data_.cond());
   VALIDATE_PTHREAD_RESULT(result);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)