vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use %I64 and not %ll when using OS printf if compiling for windows.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-17 16:04:47 +01:00
parent d218ec9738
commit 18e76955be
11 changed files with 77 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
grub-core/disk/diskfilter.c
View file

@ -1057,7 +1057,8 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
(unsigned long long) grub_disk_get_size (disk),
array->name, diskfilter->name);
#ifdef GRUB_UTIL
grub_util_info ("Inserting %s (+%lld,%lld) into %s (%s)\n", disk->name,
grub_util_info ("Inserting %s (+%" GRUB_HOST_PRIuLONG_LONG ",%"
GRUB_HOST_PRIuLONG_LONG ") into %s (%s)\n", disk->name,
(unsigned long long) grub_partition_get_start (disk->partition),
(unsigned long long) grub_disk_get_size (disk),
array->name, diskfilter->name);

4
grub-core/kern/emu/hostdisk.c
View file

@ -171,8 +171,8 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
grub_util_fd_close (fd);
grub_util_info ("the size of %s is %" PRIuGRUB_UINT64_T,
name, disk->total_sectors);
grub_util_info ("the size of %s is %" GRUB_HOST_PRIuLONG_LONG,
name, (unsigned long long) disk->total_sectors);
return GRUB_ERR_NONE;
}

6
grub-core/osdep/windows/blocklist.c
View file

@ -84,8 +84,10 @@ grub_install_get_blocklist (grub_device_t root_dev,
grub_util_error ("unsupported fs for blocklist under windows: %s",
fs->name);
grub_util_info ("sec_per_lcn = %lld, first_lcn=%lld",
(long long) sec_per_lcn, (long long) first_lcn);
grub_util_info ("sec_per_lcn = %" GRUB_HOST_PRIuLONG_LONG
", first_lcn=%" GRUB_HOST_PRIuLONG_LONG,
(unsigned long long) sec_per_lcn,
(unsigned long long) first_lcn);
first_lcn += grub_partition_get_start (root_dev->disk->partition);