diff options
| author | Liav A <liavalb@gmail.com> | 2020-02-01 23:11:47 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-02-02 00:20:41 +0100 |
| commit | 8cde707931ce03bb7e484138249823d8461a1019 (patch) | |
| tree | a8039b317515238a72bc34a6ea11d16532c143ed | |
| parent | 0f81e8d9af5bf0a5a57cde48d3de6a71ca76da19 (diff) | |
| download | serenity-8cde707931ce03bb7e484138249823d8461a1019.zip | |
Partition Table: Replace __attribute__((packed)) with [[gnu::packed]]
| -rw-r--r-- | Kernel/Devices/MBRPartitionTable.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Kernel/Devices/MBRPartitionTable.h b/Kernel/Devices/MBRPartitionTable.h index 90fb4dc43c..9d7f033cba 100644 --- a/Kernel/Devices/MBRPartitionTable.h +++ b/Kernel/Devices/MBRPartitionTable.h @@ -34,16 +34,18 @@ #define MBR_SIGNATURE 0xaa55 #define MBR_PROTECTIVE 0xEE -struct MBRPartitionEntry { +struct [[gnu::packed]] MBRPartitionEntry +{ u8 status; u8 chs1[3]; u8 type; u8 chs2[3]; u32 offset; u32 length; -} __attribute__((packed)); +}; -struct MBRPartitionHeader { +struct [[gnu::packed]] MBRPartitionHeader +{ u8 code1[218]; u16 ts_zero; u8 ts_drive, ts_seconds, ts_minutes, ts_hours; @@ -52,7 +54,7 @@ struct MBRPartitionHeader { u16 disk_signature_zero; MBRPartitionEntry entry[4]; u16 mbr_signature; -} __attribute__((packed)); +}; class MBRPartitionTable { AK_MAKE_ETERNAL |