ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

am 0e1313cd: Merge "libgui: 64-bit compile issues"

Browse Source 
* commit '0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564':
  libgui: 64-bit compile issues
This commit is contained in:
Mark Salyzyn 2014-06-09 21:46:25 +00:00 committed by Android Git Automerger
commit 72676e7d0d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gui/BitTube.cpp
View File

@ -145,7 +145,7 @@ ssize_t BitTube::sendObjects(const sp<BitTube>& tube,
// should never happen because of SOCK_SEQPACKET // should never happen because of SOCK_SEQPACKET
LOG_ALWAYS_FATAL_IF((size >= 0) && (size % objSize), 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); count, objSize, size);
//ALOGE_IF(size<0, "error %d sending %d events", size, count); //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 // should never happen because of SOCK_SEQPACKET
LOG_ALWAYS_FATAL_IF((size >= 0) && (size % objSize), 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); count, objSize, size);
//ALOGE_IF(size<0, "error %d receiving %d events", size, count); //ALOGE_IF(size<0, "error %d receiving %d events", size, count);

6
libs/gui/ConsumerBase.cpp
View File

@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include <inttypes.h>
#define LOG_TAG "ConsumerBase" #define LOG_TAG "ConsumerBase"
#define ATRACE_TAG ATRACE_TAG_GRAPHICS #define ATRACE_TAG ATRACE_TAG_GRAPHICS
//#define LOG_NDEBUG 0 //#define LOG_NDEBUG 0
@ -188,7 +190,7 @@ status_t ConsumerBase::acquireBufferLocked(BufferQueue::BufferItem *item,
mSlots[item->mBuf].mFrameNumber = item->mFrameNumber; mSlots[item->mBuf].mFrameNumber = item->mFrameNumber;
mSlots[item->mBuf].mFence = item->mFence; mSlots[item->mBuf].mFence = item->mFence;
CB_LOGV("acquireBufferLocked: -> slot=%d/%llu", CB_LOGV("acquireBufferLocked: -> slot=%d/%" PRIu64,
item->mBuf, item->mFrameNumber); item->mBuf, item->mFrameNumber);
return OK; return OK;
@ -239,7 +241,7 @@ status_t ConsumerBase::releaseBufferLocked(
return OK; return OK;
} }
CB_LOGV("releaseBufferLocked: slot=%d/%llu", CB_LOGV("releaseBufferLocked: slot=%d/%" PRIu64,
slot, mSlots[slot].mFrameNumber); slot, mSlots[slot].mFrameNumber);
status_t err = mConsumer->releaseBuffer(slot, mSlots[slot].mFrameNumber, status_t err = mConsumer->releaseBuffer(slot, mSlots[slot].mFrameNumber,
display, eglFence, mSlots[slot].mFence); display, eglFence, mSlots[slot].mFence);