commit 1874e6557cbaf36e6893e502d4cdd7c645444b8f
author Mark Salyzyn <salyzyn@google.com> Thu Mar 13 16:38:43 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Mar 13 17:46:53 2014 -0700
tree 5aced1e4f7ef6a9ce8d2b65657816631bd99f717
parent 1a3798996b710370091419fd30b954bec5127e29

libdiskconfig: 64-bit issues

Change-Id: Ie5e790c36395ec2f844294b91241a8f8ba3834b8

libdiskconfig/diskconfig.c

diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c
index 6fd81b7..1167d4b 100644
--- a/libdiskconfig/diskconfig.c
+++ b/libdiskconfig/diskconfig.c
@@ -30,7 +30,7 @@
 #include <linux/fs.h>
 
 #include <cutils/config_utils.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <diskconfig/diskconfig.h>
 
@@ -337,7 +337,7 @@
     }
 
 #if 1
-    ALOGV("Device/file %s: size=%llu bytes, num_lba=%u, sect_size=%d",
+    ALOGV("Device/file %s: size=%" PRIu64 " bytes, num_lba=%u, sect_size=%d",
          dinfo->device, disk_size, dinfo->num_lba, dinfo->sect_size);
 #endif