diff options
author | 2014-04-18 00:40:01 +0000 | |
---|---|---|
committer | 2014-04-18 00:40:01 +0000 | |
commit | da93c60d8a5b79f90d44408d992fb532eaaf8fa7 (patch) | |
tree | 32121b79ad6405817cdae26a3f8803c587f40857 | |
parent | 7325863013e5c34d493e4e92ecadf4fea87554e7 (diff) | |
parent | 5b6da1aee884d32d8140e27c5b5b4d16ea4a37c8 (diff) |
Merge "jni: binder ptrdiff_t compile issues"
-rw-r--r-- | core/jni/android_util_Binder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 5a053ed91ae9..662af895e04f 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -966,7 +966,7 @@ static bool push_eventlog_string(char** pos, const char* end, const char* str) { jint len = strlen(str); int space_needed = 1 + sizeof(len) + len; if (end - *pos < space_needed) { - ALOGW("not enough space for string. remain=%zd; needed=%d", + ALOGW("not enough space for string. remain=%" PRIdPTR "; needed=%d", end - *pos, space_needed); return false; } @@ -982,7 +982,7 @@ static bool push_eventlog_string(char** pos, const char* end, const char* str) { static bool push_eventlog_int(char** pos, const char* end, jint val) { int space_needed = 1 + sizeof(val); if (end - *pos < space_needed) { - ALOGW("not enough space for int. remain=%zd; needed=%d", + ALOGW("not enough space for int. remain=%" PRIdPTR "; needed=%d", end - *pos, space_needed); return false; } |