summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2014-06-11 17:44:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-11 17:44:52 +0000
commit55fc54970b674280376bbf037153ca1a5e53bc32 (patch)
tree85c4d06c9dc60c44f51bc1f63fdc356c93b6a195 /libs/gui/ConsumerBase.cpp
parentb37c8c545384e358bc7f54e8c600acc399afd251 (diff)
parent72676e7d0db89d477495245aa15f1a128b5c35bc (diff)
am 72676e7d: am 0e1313cd: Merge "libgui: 64-bit compile issues"
* commit '72676e7d0db89d477495245aa15f1a128b5c35bc': libgui: 64-bit compile issues
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
-rw-r--r--libs/gui/ConsumerBase.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index f1b8fa8bb5..f19b6c7737 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <inttypes.h>
+
#define LOG_TAG "ConsumerBase"
#define ATRACE_TAG ATRACE_TAG_GRAPHICS
//#define LOG_NDEBUG 0
@@ -191,7 +193,7 @@ status_t ConsumerBase::acquireBufferLocked(BufferQueue::BufferItem *item,
mSlots[item->mBuf].mFrameNumber = item->mFrameNumber;
mSlots[item->mBuf].mFence = item->mFence;
- CB_LOGV("acquireBufferLocked: -> slot=%d/%llu",
+ CB_LOGV("acquireBufferLocked: -> slot=%d/%" PRIu64,
item->mBuf, item->mFrameNumber);
return OK;
@@ -242,7 +244,7 @@ status_t ConsumerBase::releaseBufferLocked(
return OK;
}
- CB_LOGV("releaseBufferLocked: slot=%d/%llu",
+ CB_LOGV("releaseBufferLocked: slot=%d/%" PRIu64,
slot, mSlots[slot].mFrameNumber);
status_t err = mConsumer->releaseBuffer(slot, mSlots[slot].mFrameNumber,
display, eglFence, mSlots[slot].mFence);