diff --git a/libs/gui/BitTube.cpp b/libs/gui/BitTube.cpp index 85a7de7e4..028283470 100644 --- a/libs/gui/BitTube.cpp +++ b/libs/gui/BitTube.cpp @@ -145,7 +145,7 @@ ssize_t BitTube::sendObjects(const sp& 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& 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 f1b8fa8bb..f19b6c773 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include + #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);