diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-13 23:12:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 23:12:09 +0000 |
| commit | 993146092f8205d9747f082ccd63c09b536caa4e (patch) | |
| tree | 89d07eb2647268606632e10e6c9add64b30f7b84 /libs/ui | |
| parent | 49bfda1fbdf828a8ea63ae2c2fa25739f6e48527 (diff) | |
| parent | d4dabf872ac0a12e12aebae9032f7d62762c2aeb (diff) | |
| download | frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.zip frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.tar.gz frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.tar.bz2 | |
am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
native frameworks: 64-bit compile issues
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 6 | ||||
| -rw-r--r-- | libs/ui/Region.cpp | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 31a69b2..918f2e7 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -259,8 +259,8 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window, return 0; } -int FramebufferNativeWindow::lockBuffer_DEPRECATED(ANativeWindow* window, - ANativeWindowBuffer* buffer) +int FramebufferNativeWindow::lockBuffer_DEPRECATED(ANativeWindow* /*window*/, + ANativeWindowBuffer* /*buffer*/) { return NO_ERROR; } @@ -326,7 +326,7 @@ int FramebufferNativeWindow::query(const ANativeWindow* window, return BAD_VALUE; } -int FramebufferNativeWindow::perform(ANativeWindow* window, +int FramebufferNativeWindow::perform(ANativeWindow* /*window*/, int operation, ...) { switch (operation) { diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp index 7de48a4..fa812f4 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> @@ -814,7 +815,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) { @@ -830,7 +831,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); |