diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-18 00:47:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-18 00:47:47 +0000 |
| commit | c5aa56872da5a06741cb0e596813c2f0a6d7a05f (patch) | |
| tree | 547afafdac4fb99dcf2a2423f045496a9c3a8a34 /core/jni | |
| parent | dc500d2d567b37c620308bc8f0b0928eba4a2f5b (diff) | |
| parent | 7423510c5a6a103a77efc36f064ed716f8810b97 (diff) | |
| download | frameworks_base-c5aa56872da5a06741cb0e596813c2f0a6d7a05f.zip frameworks_base-c5aa56872da5a06741cb0e596813c2f0a6d7a05f.tar.gz frameworks_base-c5aa56872da5a06741cb0e596813c2f0a6d7a05f.tar.bz2 | |
am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"
* commit '7423510c5a6a103a77efc36f064ed716f8810b97':
jni: binder ptrdiff_t compile issues
Diffstat (limited to 'core/jni')
| -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; } |