summaryrefslogtreecommitdiffstats
path: root/media/mtp
diff options
context:
space:
mode:
authorKévin PETIT <kevin.petit@arm.com>2014-02-03 12:35:36 +0000
committerNarayan Kamath <narayan@google.com>2014-02-11 11:40:06 +0000
commit377b2ec9a2885f9b6405b07ba900a9e3f4349c38 (patch)
treeb938e1d75a1beefae86244f287ca22f4a277740d /media/mtp
parentcdda7bf4d3ca9cad6979374a18dd5be79ea83d80 (diff)
downloadframeworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.zip
frameworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.tar.gz
frameworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.tar.bz2
Make frameworks/av 64-bit compatible
Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
Diffstat (limited to 'media/mtp')
-rw-r--r--media/mtp/MtpProperty.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/mtp/MtpProperty.cpp b/media/mtp/MtpProperty.cpp
index 64dd45b..375ed9a 100644
--- a/media/mtp/MtpProperty.cpp
+++ b/media/mtp/MtpProperty.cpp
@@ -16,6 +16,7 @@
#define LOG_TAG "MtpProperty"
+#include <inttypes.h>
#include "MtpDataPacket.h"
#include "MtpDebug.h"
#include "MtpProperty.h"
@@ -385,10 +386,10 @@ void MtpProperty::print(MtpPropertyValue& value, MtpString& buffer) {
buffer.appendFormat("%d", value.u.u32);
break;
case MTP_TYPE_INT64:
- buffer.appendFormat("%lld", value.u.i64);
+ buffer.appendFormat("%" PRId64, value.u.i64);
break;
case MTP_TYPE_UINT64:
- buffer.appendFormat("%lld", value.u.u64);
+ buffer.appendFormat("%" PRIu64, value.u.u64);
break;
case MTP_TYPE_INT128:
buffer.appendFormat("%08X%08X%08X%08X", value.u.i128[0], value.u.i128[1],