diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-24 10:26:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-24 10:26:55 -0400 |
| commit | 6ae395a6366ceefffe8f492911a4e517bdbbc7b2 (patch) | |
| tree | c4b431e94d3877897f8f26e68a7a39a2dce0cd9d /include/global.h | |
| parent | 5539e282a39c34a278d1ea2fdc53ee46ffe154d5 (diff) | |
| parent | de60bdf2febff1879d7a1985a009dc439a546497 (diff) | |
Merge branch 'master' into contest
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/global.h b/include/global.h index 5e742d732..46413b197 100644 --- a/include/global.h +++ b/include/global.h @@ -12,14 +12,9 @@ #define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #define NAKED __attribute__((naked)) -// While this nomenclature change is being rolled out, the following -// redundant define will be used to prevent build errors when merging -// from master. -// TODO: Remove this before merging the pull request. -#define ASM_DIRECT NAKED // IDE support -#if defined (__APPLE__) || defined (__CYGWIN__) +#if defined (__APPLE__) || defined (__CYGWIN__) || defined (_MSC_VER) #define _(x) x #define __(x) x #define INCBIN_U8 {0} @@ -28,7 +23,7 @@ #define INCBIN_S8 {0} #define INCBIN_S16 {0} #define INCBIN_S32 {0} -#endif // __APPLE__ +#endif // IDE support #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0])) |