From fec498e588633a019ea7c93e3a8cca12bb1b3f02 Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Tue, 24 Jun 2014 23:08:00 -0700
Subject: Don't return NULL as a jint.

Build fix.

Change-Id: I49a566c3c34d2040e092689e52b0039c8195de03
---
 luni/src/main/native/libcore_io_Posix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luni/src/main/native/libcore_io_Posix.cpp b/luni/src/main/native/libcore_io_Posix.cpp
index 2592fe7..51dd8a1 100644
--- a/luni/src/main/native/libcore_io_Posix.cpp
+++ b/luni/src/main/native/libcore_io_Posix.cpp
@@ -868,7 +868,7 @@ static jint Posix_gettid(JNIEnv* env __unused, jobject) {
   int rc = pthread_threadid_np(NULL, &owner);  // Requires Mac OS 10.6
   if (rc != 0) {
     throwErrnoException(env, "gettid");
-    return NULL;
+    return 0;
   }
   return static_cast<jint>(owner);
 #else
-- 
cgit v1.1