KotJohansson/UXP
1
0
Fork 0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 14:54:25 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Smith
2024-05-07 11:30:59 +02:00
committed by roytam1
parent c77b4b0bad
commit de8213f561
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/events/TextComposition.cpp
-13
View File
@@ -21,21 +21,8 @@
#include "mozilla/Unused.h"
#include "mozilla/dom/TabParent.h"
#ifdef XP_MACOSX
// Some defiens will be conflict with OSX SDK
#define TextRange _TextRange
#define TextRangeArray _TextRangeArray
#define Comment _Comment
#endif
#include "nsPluginInstanceOwner.h"
#ifdef XP_MACOSX
#undef TextRange
#undef TextRangeArray
#undef Comment
#endif
using namespace mozilla::widget;
namespace mozilla {
dom/plugins/base/npapi.h
+7
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>
dom/plugins/base/nsPluginInstanceOwner.h
+7
View File
@@ -20,7 +20,14 @@
#ifdef XP_MACOSX
#include "mozilla/gfx/QuartzSupport.h"
// 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
#endif
class nsIInputStream;