diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-08-21 12:59:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-21 12:59:01 -0400 |
| commit | 064f836d1c4f6de7d7c100b4aff700bf66448e22 (patch) | |
| tree | 7f087cacbde745c7d64f205618b80624c8599074 /src/common/microprofile.h | |
| parent | e37e3d3634cefb18a90b094cfd000535d08d1944 (diff) | |
| parent | 14e9de6678dab47625826006f001d5e94dfb2716 (diff) | |
Merge pull request #8784 from Docteh/nosnek
code: dodge PAGE_SIZE #define
Diffstat (limited to 'src/common/microprofile.h')
| -rw-r--r-- | src/common/microprofile.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/common/microprofile.h b/src/common/microprofile.h index 91d14d5e1..56ef0a2dc 100644 --- a/src/common/microprofile.h +++ b/src/common/microprofile.h @@ -22,12 +22,3 @@ typedef void* HANDLE; #include <microprofile.h> #define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0) - -// On OS X, some Mach header included by MicroProfile defines these as macros, conflicting with -// identifiers we use. -#ifdef PAGE_SIZE -#undef PAGE_SIZE -#endif -#ifdef PAGE_MASK -#undef PAGE_MASK -#endif |