diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-09 14:27:45 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-06-09 14:27:45 -0700 |
| commit | 911004506dcb6ee68efdfd6636e0ffc72e6972b8 (patch) | |
| tree | 317370fd1641859b65a89169d99a188f3432854c | |
| parent | c4193f1fef52314b451f55cce48ce44f94b875b6 (diff) | |
| download | native-911004506dcb6ee68efdfd6636e0ffc72e6972b8.tar.gz | |
libgui: 64-bit compile issues
Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
| -rw-r--r-- | libs/gui/BitTube.cpp | 4 | ||||
| -rw-r--r-- | libs/gui/ConsumerBase.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libs/gui/BitTube.cpp b/libs/gui/BitTube.cpp index 85a7de7e40..0282834703 100644 --- a/libs/gui/BitTube.cpp +++ b/libs/gui/BitTube.cpp @@ -145,7 +145,7 @@ ssize_t BitTube::sendObjects(const sp<BitTube>& tube, // should never happen because of SOCK_SEQPACKET LOG_ALWAYS_FATAL_IF((size >= 0) && (size % objSize), - "BitTube::sendObjects(count=%d, size=%d), res=%d (partial events were sent!)", + "BitTube::sendObjects(count=%zu, size=%zu), res=%zd (partial events were sent!)", count, objSize, size); //ALOGE_IF(size<0, "error %d sending %d events", size, count); @@ -160,7 +160,7 @@ ssize_t BitTube::recvObjects(const sp<BitTube>& tube, // should never happen because of SOCK_SEQPACKET LOG_ALWAYS_FATAL_IF((size >= 0) && (size % objSize), - "BitTube::recvObjects(count=%d, size=%d), res=%d (partial events were received!)", + "BitTube::recvObjects(count=%zu, size=%zu), res=%zd (partial events were received!)", count, objSize, size); //ALOGE_IF(size<0, "error %d receiving %d events", size, count); diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index c4ec8578a8..674ee5acc0 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 @@ -188,7 +190,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; @@ -239,7 +241,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); |