Merge pull request #8784 from Docteh/nosnek
code: dodge PAGE_SIZE #define
This commit is contained in:
commit
064f836d1c
17 changed files with 116 additions and 119 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue