wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 20:07:30 +09:00
Code Issues Projects Releases Packages 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
commit de8213f561
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dom/events/TextComposition.cpp
View file

@ -21,21 +21,8 @@
#include "mozilla/Unused.h" #include "mozilla/Unused.h"
#include "mozilla/dom/TabParent.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" #include "nsPluginInstanceOwner.h"
#ifdef XP_MACOSX
#undef TextRange
#undef TextRangeArray
#undef Comment
#endif
using namespace mozilla::widget; using namespace mozilla::widget;
namespace mozilla { namespace mozilla {

7
dom/plugins/base/npapi.h
View file

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

7
dom/plugins/base/nsPluginInstanceOwner.h
View file

@ -20,7 +20,14 @@
#ifdef XP_MACOSX #ifdef XP_MACOSX
#include "mozilla/gfx/QuartzSupport.h" #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> #include <ApplicationServices/ApplicationServices.h>
#undef TextRange
#undef TextRangeArray
#undef Comment
#endif #endif
class nsIInputStream; class nsIInputStream;