diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-22 13:35:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 13:35:26 -0400 |
| commit | d2e33d58e2353895e2affe0ab803315ad5aef37b (patch) | |
| tree | 945ba8f5039c0914d7c94490d2b6146f9a9a441d /include | |
| parent | aeeff84462973b267e62031a945603d96afed716 (diff) | |
| parent | 30793ff41bd0c289dc58fad13bb6251923296836 (diff) | |
Merge pull request #795 from PikalaxALT/common_fix
Fix compatibility with gcc-10
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 4 | ||||
| -rw-r--r-- | include/link.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h index 0046c3878..38923710d 100644 --- a/include/config.h +++ b/include/config.h @@ -68,4 +68,8 @@ // Fixed in Emerald. // #define BUGFIX_SETMONIVS +#if MODERN +#define UBFIX +#endif //MODERN + #endif // GUARD_CONFIG_H diff --git a/include/link.h b/include/link.h index 58e28f42d..6c9c25202 100644 --- a/include/link.h +++ b/include/link.h @@ -147,7 +147,7 @@ extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gLinkOpen; extern bool8 gLinkPlayerPending[MAX_LINK_PLAYERS]; -void (*gLinkCallback)(void); +extern void (*gLinkCallback)(void); extern u8 gUnknown_Debug_30030E0; void Task_DestroySelf(u8); |