Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e1313cd authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "libgui: 64-bit compile issues"

parents c4193f1f 91100450

libs/gui/BitTube.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

libs/gui/ConsumerBase.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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);