summaryrefslogtreecommitdiff
path: root/libs/ui/Region.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2014-03-13 15:26:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-13 15:26:10 +0000
commitd4dabf872ac0a12e12aebae9032f7d62762c2aeb (patch)
treea4c803ecda0a5ddb4655ba135e175d1f57f3d17c /libs/ui/Region.cpp
parentffd353a73eb7794ef556c4e646f866b580a03abb (diff)
parentcdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba (diff)
am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba': native frameworks: 64-bit compile issues
Diffstat (limited to 'libs/ui/Region.cpp')
-rw-r--r--libs/ui/Region.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index e5abcf5c84..6d58f5649b 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -16,6 +16,7 @@
#define LOG_TAG "Region"
+#include <inttypes.h>
#include <limits.h>
#include <utils/Log.h>
@@ -798,7 +799,7 @@ void Region::dump(String8& out, const char* what, uint32_t flags) const
size_t SIZE = 256;
char buffer[SIZE];
- snprintf(buffer, SIZE, " Region %s (this=%p, count=%d)\n",
+ snprintf(buffer, SIZE, " Region %s (this=%p, count=%" PRIdPTR ")\n",
what, this, tail-head);
out.append(buffer);
while (head != tail) {
@@ -814,7 +815,7 @@ void Region::dump(const char* what, uint32_t flags) const
(void)flags;
const_iterator head = begin();
const_iterator const tail = end();
- ALOGD(" Region %s (this=%p, count=%d)\n", what, this, tail-head);
+ ALOGD(" Region %s (this=%p, count=%" PRIdPTR ")\n", what, this, tail-head);
while (head != tail) {
ALOGD(" [%3d, %3d, %3d, %3d]\n",
head->left, head->top, head->right, head->bottom);