Merge pull request #37 from RSpliet/master

Fix build warnings on 32-bit systems
envytools · Feb 5, 2016 · 730e83d · 730e83d
2 parents 1571b8d + 9391b7c
commit 730e83d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/demmt/drm.c b/demmt/drm.c
@@ -771,7 +771,7 @@ int demmt_drm_ioctl_post(uint32_t fd, uint32_t id, uint8_t dir, uint8_t nr, uint
 
 		if (dump_decoded_ioctl_data)
 		{
-			mmt_log("%sDRM_IOCTL_VERSION64%s, version: %s%d.%d.%d%s, name_addr: 0x%lx, name_len: %ld, date_addr: 0x%lx, date_len: %ld, desc_addr: 0x%lx, desc_len: %ld%s\n",
+			mmt_log("%sDRM_IOCTL_VERSION64%s, version: %s%d.%d.%d%s, name_addr: 0x%"PRIx64", name_len: %"PRIu64", date_addr: 0x%"PRIx64", date_len: %"PRIu64", desc_addr: 0x%"PRIx64", desc_len: %"PRIu64"%s\n",
 					colors->rname, colors->reset, colors->eval, data->version_major,
 					data->version_minor, data->version_patchlevel, colors->reset,
 					data->name, data->name_len, data->date, data->date_len,

diff --git a/nvbios/mem.c b/nvbios/mem.c
@@ -113,7 +113,7 @@ envy_bios_parse_mem_train (struct envy_bios *bios) {
 		err |= bios_u8(bios, entry->offset, &entry->u00);
 		if (mt->subentries > sizeof(entry->subentry)) {
 			mt->subentries = sizeof(entry->subentry);
-			ENVY_BIOS_ERR("Error when parsing mem train: subentries = %d > %lu\n", mt->subentries, sizeof(entry->subentry));
+			ENVY_BIOS_ERR("Error when parsing mem train: subentries = %d > %zu\n", mt->subentries, sizeof(entry->subentry));
 			return -EFAULT;
 		}
 		int j;