diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-02-13 02:05:11 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-13 00:05:11 -0500 |
| commit | 2191c8b0a073cf58a5106bd3055fb276eead8b83 (patch) | |
| tree | 130eca1b72e156fb288f890ce3d5ca1e69582a65 /src/code | |
| parent | ed0daabf98a92ab0232dcfb9ea071bd3411b762e (diff) | |
Use `__builtin_offsetof` for non IDO builds (#1140)
* Add offsetof macro
* Change old uses of OFFSETOF with offsetof
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_sram.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 5d6b25982..f2844a88a 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -74,13 +74,13 @@ typedef struct { #define SLOT_SIZE (sizeof(SaveContext) + 0x28) #define CHECKSUM_SIZE (sizeof(Save) / 2) -#define DEATHS OFFSETOF(SaveContext, deaths) -#define NAME OFFSETOF(SaveContext, playerName) -#define N64DD OFFSETOF(SaveContext, n64ddFlag) -#define HEALTH_CAP OFFSETOF(SaveContext, healthCapacity) -#define QUEST OFFSETOF(SaveContext, inventory.questItems) -#define DEFENSE OFFSETOF(SaveContext, inventory.defenseHearts) -#define HEALTH OFFSETOF(SaveContext, health) +#define DEATHS offsetof(SaveContext, deaths) +#define NAME offsetof(SaveContext, playerName) +#define N64DD offsetof(SaveContext, n64ddFlag) +#define HEALTH_CAP offsetof(SaveContext, healthCapacity) +#define QUEST offsetof(SaveContext, inventory.questItems) +#define DEFENSE offsetof(SaveContext, inventory.defenseHearts) +#define HEALTH offsetof(SaveContext, health) #define SLOT_OFFSET(index) (SRAM_HEADER_SIZE + 0x10 + (index * SLOT_SIZE)) |