diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-18 00:43:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-18 00:43:36 +0000 |
| commit | 7423510c5a6a103a77efc36f064ed716f8810b97 (patch) | |
| tree | 38d5d5faffd0ed2088b5b98e5089e029756434a7 | |
| parent | 4037847c0251a15ea88012a8405d0688c8b1ac53 (diff) | |
| parent | da93c60d8a5b79f90d44408d992fb532eaaf8fa7 (diff) | |
| download | frameworks_base-7423510c5a6a103a77efc36f064ed716f8810b97.zip frameworks_base-7423510c5a6a103a77efc36f064ed716f8810b97.tar.gz frameworks_base-7423510c5a6a103a77efc36f064ed716f8810b97.tar.bz2 | |
am da93c60d: Merge "jni: binder ptrdiff_t compile issues"
* commit 'da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
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 5a053ed..662af89 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; } |