Merge pull request #56 from Kernel-Team/2.02-coreos
Fix packed not aligned error on GCC 8
This commit is contained in:
commit
2f868ac992
|
|
@ -175,7 +175,7 @@ struct grub_btrfs_time
|
||||||
{
|
{
|
||||||
grub_int64_t sec;
|
grub_int64_t sec;
|
||||||
grub_uint32_t nanosec;
|
grub_uint32_t nanosec;
|
||||||
} __attribute__ ((aligned (4)));
|
} GRUB_PACKED;
|
||||||
|
|
||||||
struct grub_btrfs_inode
|
struct grub_btrfs_inode
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel
|
||||||
|
|
||||||
struct efi_variable
|
struct efi_variable
|
||||||
{
|
{
|
||||||
grub_efi_guid_t guid;
|
grub_efi_packed_guid_t guid;
|
||||||
grub_uint32_t namelen;
|
grub_uint32_t namelen;
|
||||||
grub_uint32_t size;
|
grub_uint32_t size;
|
||||||
grub_efi_uint32_t attributes;
|
grub_efi_uint32_t attributes;
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ struct grub_gpt_guid
|
||||||
grub_uint16_t data2;
|
grub_uint16_t data2;
|
||||||
grub_uint16_t data3;
|
grub_uint16_t data3;
|
||||||
grub_uint8_t data4[8];
|
grub_uint8_t data4[8];
|
||||||
} __attribute__ ((aligned(8)));
|
} GRUB_PACKED;
|
||||||
typedef struct grub_gpt_guid grub_gpt_guid_t;
|
typedef struct grub_gpt_guid grub_gpt_guid_t;
|
||||||
typedef struct grub_gpt_guid grub_gpt_part_type_t;
|
typedef struct grub_gpt_guid grub_gpt_part_type_t;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue