| Index: runtime/bin/thread_linux.cc
 | 
| diff --git a/runtime/bin/thread_linux.cc b/runtime/bin/thread_linux.cc
 | 
| index 6ea923ea13675fbb2d3e940c30af0af255a51c92..6e6971fe938472bf3c9cbe6d99c9e632bb844d36 100644
 | 
| --- a/runtime/bin/thread_linux.cc
 | 
| +++ b/runtime/bin/thread_linux.cc
 | 
| @@ -8,9 +8,9 @@
 | 
|  #include "bin/thread.h"
 | 
|  #include "bin/thread_linux.h"
 | 
|  
 | 
| -#include <errno.h>  // NOLINT
 | 
| +#include <errno.h>         // NOLINT
 | 
|  #include <sys/resource.h>  // NOLINT
 | 
| -#include <sys/time.h>  // NOLINT
 | 
| +#include <sys/time.h>      // NOLINT
 | 
|  
 | 
|  #include "platform/assert.h"
 | 
|  #include "platform/utils.h"
 | 
| @@ -18,29 +18,28 @@
 | 
|  namespace dart {
 | 
|  namespace bin {
 | 
|  
 | 
| -#define VALIDATE_PTHREAD_RESULT(result) \
 | 
| -  if (result != 0) { \
 | 
| -    const int kBufferSize = 1024; \
 | 
| -    char error_buf[kBufferSize]; \
 | 
| -    FATAL2("pthread error: %d (%s)", result, \
 | 
| -           Utils::StrError(result, error_buf, kBufferSize)); \
 | 
| +#define VALIDATE_PTHREAD_RESULT(result)                                        \
 | 
| +  if (result != 0) {                                                           \
 | 
| +    const int kBufferSize = 1024;                                              \
 | 
| +    char error_buf[kBufferSize];                                               \
 | 
| +    FATAL2("pthread error: %d (%s)", result,                                   \
 | 
| +           Utils::StrError(result, error_buf, kBufferSize));                   \
 | 
|    }
 | 
|  
 | 
|  
 | 
|  #ifdef DEBUG
 | 
| -#define RETURN_ON_PTHREAD_FAILURE(result) \
 | 
| -  if (result != 0) { \
 | 
| -    const int kBufferSize = 1024; \
 | 
| -    char error_buf[kBufferSize]; \
 | 
| -    fprintf(stderr, "%s:%d: pthread error: %d (%s)\n", \
 | 
| -            __FILE__, __LINE__, result, \
 | 
| -            Utils::StrError(result, error_buf, kBufferSize)); \
 | 
| -    return result; \
 | 
| +#define RETURN_ON_PTHREAD_FAILURE(result)                                      \
 | 
| +  if (result != 0) {                                                           \
 | 
| +    const int kBufferSize = 1024;                                              \
 | 
| +    char error_buf[kBufferSize];                                               \
 | 
| +    fprintf(stderr, "%s:%d: pthread error: %d (%s)\n", __FILE__, __LINE__,     \
 | 
| +            result, Utils::StrError(result, error_buf, kBufferSize));          \
 | 
| +    return result;                                                             \
 | 
|    }
 | 
|  #else
 | 
| -#define RETURN_ON_PTHREAD_FAILURE(result) \
 | 
| -  if (result != 0) { \
 | 
| -    return result; \
 | 
| +#define RETURN_ON_PTHREAD_FAILURE(result)                                      \
 | 
| +  if (result != 0) {                                                           \
 | 
| +    return result;                                                             \
 | 
|    }
 | 
|  #endif
 | 
|  
 | 
| @@ -62,8 +61,7 @@ static void ComputeTimeSpecMicros(struct timespec* ts, int64_t micros) {
 | 
|  
 | 
|  class ThreadStartData {
 | 
|   public:
 | 
| -  ThreadStartData(Thread::ThreadStartFunction function,
 | 
| -                  uword parameter)
 | 
| +  ThreadStartData(Thread::ThreadStartFunction function, uword parameter)
 | 
|        : function_(function), parameter_(parameter) {}
 | 
|  
 | 
|    Thread::ThreadStartFunction function() const { return function_; }
 | 
| 
 |