claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MSVC: Fix usage of gcc __attribute__((packed))

Browse Source 
Yes, this is ugly but sadly there's no standard way to define packed
structs
This commit is contained in:
darkstar
2018-02-21 20:46:07 +01:00
parent d213bcf735
commit 93f9233fb6
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cdrom/cdrom_image.cc
View File

@@ -386,6 +386,11 @@ static int image_is_track_audio(uint8_t id, uint32_t pos, int ismsf)
return attr == AUDIO_TRACK; return attr == AUDIO_TRACK;
} }
#ifdef _MSC_VER
#pragma pack(push, 1)
#define __attribute__(x)
#endif
typedef struct __attribute__((__packed__)) typedef struct __attribute__((__packed__))
{ {
uint8_t user_data[2048]; uint8_t user_data[2048];
@@ -433,6 +438,11 @@ typedef union __attribute__((__packed__))
uint8_t buffer[2856]; uint8_t buffer[2856];
} sector_buffer_t; } sector_buffer_t;
#ifdef _MSC_VER
#pragma pack(pop)
#undef __attribute__
#endif
sector_buffer_t cdrom_sector_buffer; sector_buffer_t cdrom_sector_buffer;
int cdrom_sector_size; int cdrom_sector_size;