Issue #2472 - Part 8: Fix conflicting defines on Mac.

This commit is contained in:
Brian Smith 2024-05-07 11:30:59 +02:00 committed by roytam1
commit de8213f561
3 changed files with 14 additions and 13 deletions

View file

@ -34,7 +34,14 @@
#endif
#if defined(XP_MACOSX)
// Some defines will conflict with OSX SDK
#define TextRange _TextRange
#define TextRangeArray _TextRangeArray
#define Comment _Comment
#include <ApplicationServices/ApplicationServices.h>
#undef TextRange
#undef TextRangeArray
#undef Comment
#include <OpenGL/OpenGL.h>
#ifndef NP_NO_CARBON
#include <Carbon/Carbon.h>