diff options
| author | Jademalo <386846+Jademalo@users.noreply.github.com> | 2021-10-23 10:10:06 +0100 |
|---|---|---|
| committer | Jademalo <386846+Jademalo@users.noreply.github.com> | 2021-10-23 10:10:06 +0100 |
| commit | 1c4d5bfed09cd9275caf98db0998958876c091d0 (patch) | |
| tree | 7135294e7beb23c3d10a5e064dbd164c00e69400 | |
| parent | 46867c546d5df8c8b86b5ad46b1c149cc1ad0688 (diff) | |
IDE support formatting and consistency
| -rw-r--r-- | berry_fix/payload/include/global.h | 21 | ||||
| -rw-r--r-- | include/global.h | 21 |
2 files changed, 22 insertions, 20 deletions
diff --git a/berry_fix/payload/include/global.h b/berry_fix/payload/include/global.h index bf0d71b69..4d9da7c7d 100644 --- a/berry_fix/payload/include/global.h +++ b/berry_fix/payload/include/global.h @@ -6,16 +6,17 @@ // global.h from pokemon ruby // IDE support -#if defined (__APPLE__) || defined (__CYGWIN__) || defined (__INTELLISENSE__) -#define _(x) x -#define __(x) x -#define INCBIN(x) {0} -#define INCBIN_U8 INCBIN -#define INCBIN_U16 INCBIN -#define INCBIN_U32 INCBIN -#define INCBIN_S8 INCBIN -#define INCBIN_S16 INCBIN -#define INCBIN_S32 INCBIN +#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__) +// We define these when using certain IDEs to fool preproc +#define _(x) (x) +#define __(x) (x) +#define INCBIN(...) {0} +#define INCBIN_U8 INCBIN +#define INCBIN_U16 INCBIN +#define INCBIN_U32 INCBIN +#define INCBIN_S8 INCBIN +#define INCBIN_S16 INCBIN +#define INCBIN_S32 INCBIN #endif // IDE support // Prevent cross-jump optimization. diff --git a/include/global.h b/include/global.h index 56be4bf5f..d6d57910d 100644 --- a/include/global.h +++ b/include/global.h @@ -17,16 +17,17 @@ #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") // IDE support -#if defined (__APPLE__) || defined (__CYGWIN__) || defined (__INTELLISENSE__) -#define _(x) x -#define __(x) x -#define INCBIN(x) {0} -#define INCBIN_U8 INCBIN -#define INCBIN_U16 INCBIN -#define INCBIN_U32 INCBIN -#define INCBIN_S8 INCBIN -#define INCBIN_S16 INCBIN -#define INCBIN_S32 INCBIN +#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__) +// We define these when using certain IDEs to fool preproc +#define _(x) (x) +#define __(x) (x) +#define INCBIN(...) {0} +#define INCBIN_U8 INCBIN +#define INCBIN_U16 INCBIN +#define INCBIN_U32 INCBIN +#define INCBIN_S8 INCBIN +#define INCBIN_S16 INCBIN +#define INCBIN_S32 INCBIN #endif // IDE support #define NELEMS(array) (sizeof(array) / sizeof((array)[0])) |