diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 00:07:36 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 00:07:36 +0100 |
| commit | 6fae3c9b75221ac611871fe5ec4bca057f6f79a2 (patch) | |
| tree | 051f350cbce1c2547902fe8982fcda4b55f89bc1 /include/global.h | |
| parent | 0bbbc1c6dfc6c2b8646276de94cedab9ddc8bc4b (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Merge branch 'master' into battle_anim
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 |