summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-24 23:08:00 -0700
committerIan Rogers <irogers@google.com>2014-06-24 23:08:00 -0700
commitfec498e588633a019ea7c93e3a8cca12bb1b3f02 (patch)
tree11e4e349abe13298cd7bcca851b0cf285fa7d610
parent31e8ef04eb3bc2029eb94393c3ce87245dd75da2 (diff)
downloadlibcore-fec498e588633a019ea7c93e3a8cca12bb1b3f02.zip
libcore-fec498e588633a019ea7c93e3a8cca12bb1b3f02.tar.gz
libcore-fec498e588633a019ea7c93e3a8cca12bb1b3f02.tar.bz2
Don't return NULL as a jint.
Build fix. Change-Id: I49a566c3c34d2040e092689e52b0039c8195de03
-rw-r--r--luni/src/main/native/libcore_io_Posix.cpp2
1 files changed, 1 insertions, 1 deletions
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