diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-05-11 17:36:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 17:36:11 -0500 |
| commit | d1df98361f2144b286472e239b2f4bd1ada7dedd (patch) | |
| tree | df5a7f6a47f1e9400fe2eac6fa2ab02f9c6904ee /include/global.h | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
| parent | ce5fc0277a2155e12475de2f3dfcb5e72adc1a6e (diff) | |
Merge pull request #252 from Diegoisawesome/master
Fix sym_common end, rename ASM_DIRECT to NAKED
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h index ec636bb07..46413b197 100644 --- a/include/global.h +++ b/include/global.h @@ -11,10 +11,10 @@ // to help in decompiling #define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") -#define ASM_DIRECT __attribute__((naked)) +#define NAKED __attribute__((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} @@ -23,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])) |