diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
| commit | 3d49abfecb20b9b86311cbd83ff92a20761ea256 (patch) | |
| tree | 9e65e0cf9a6ce4ba318f0e144553248e6709eb61 /include/global.h | |
| parent | 501482beadd05c5ade13f6919c3c2cd42c86952d (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
fix merge conflicts
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 c7027eccf..0764718ca 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 |