frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Avoid namespace collission for BOOL in Sparkle 

(cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)
This commit is contained in:
Jeremy Huddleston 2009-07-28 13:40:15 -07:00
parent 442967c90d
commit 1e49c8d340
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/X11Application.m
View File

@ -50,10 +50,6 @@
#include <unistd.h> #include <unistd.h>
#include <AvailabilityMacros.h> #include <AvailabilityMacros.h>
#ifdef XQUARTZ_SPARKLE
#include <Sparkle/SUUpdater.h>
#endif
#include <Xplugin.h> #include <Xplugin.h>
// pbproxy/pbproxy.h // pbproxy/pbproxy.h

2
hw/xquartz/X11Controller.h
View File

@ -40,7 +40,9 @@
#include "xpr/x-list.h" #include "xpr/x-list.h"
#ifdef XQUARTZ_SPARKLE #ifdef XQUARTZ_SPARKLE
#define BOOL OSX_BOOL
#include <Sparkle/SUUpdater.h> #include <Sparkle/SUUpdater.h>
#undef BOOL
#endif #endif
@interface X11Controller : NSObject @interface X11Controller : NSObject