mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2025-12-28 13:20:06 +01:00
XQuartz: Avoid namespace collission for BOOL in Sparkle
(cherry picked from commit 227c6e01a6)
This commit is contained in:
parent
442967c90d
commit
1e49c8d340
2 changed files with 2 additions and 4 deletions
|
|
@ -50,10 +50,6 @@
|
|||
#include <unistd.h>
|
||||
#include <AvailabilityMacros.h>
|
||||
|
||||
#ifdef XQUARTZ_SPARKLE
|
||||
#include <Sparkle/SUUpdater.h>
|
||||
#endif
|
||||
|
||||
#include <Xplugin.h>
|
||||
|
||||
// pbproxy/pbproxy.h
|
||||
|
|
|
|||
|
|
@ -40,7 +40,9 @@
|
|||
#include "xpr/x-list.h"
|
||||
|
||||
#ifdef XQUARTZ_SPARKLE
|
||||
#define BOOL OSX_BOOL
|
||||
#include <Sparkle/SUUpdater.h>
|
||||
#undef BOOL
|
||||
#endif
|
||||
|
||||
@interface X11Controller : NSObject
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue