diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 22:22:35 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 22:22:35 -0500 |
| commit | a269efbcf3cfa8df6a285d01a286933804103bd5 (patch) | |
| tree | 42651b5ebe89ef42cd7b6ae24033ca21c13f9c12 /include/global.h | |
| parent | 5f6867767ca6dfa9496816421242ad4d563e1758 (diff) | |
| parent | f0e98a9204bf19981c0c9652bc9ed82ae95438e4 (diff) | |
Merge branch 'master' into use_agbcc_libc
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/global.h b/include/global.h index 4ae5de873..76300d36d 100644 --- a/include/global.h +++ b/include/global.h @@ -5,7 +5,7 @@ #include "config.h" // IDE support -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__CYGWIN__) #define _(x) x #define __(x) x #define INCBIN_U8 {0} @@ -27,14 +27,6 @@ int strcmp (const char *, const char *); #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n") -#define nonmatching(fndec, x) {\ -__attribute__((naked))\ -fndec\ -{\ - asm_unified(x);\ -}\ -} - #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) #define POKEMON_SLOTS_NUMBER 412 |