From 1e49c8d340ee8d8b6f90abcc2e2e9c390cbcd622 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue, 28 Jul 2009 13:40:15 -0700
Subject: [PATCH] XQuartz: Avoid namespace collission for BOOL in Sparkle
 (cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)

---
 hw/xquartz/X11Application.m | 4 ----
 hw/xquartz/X11Controller.h  | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f5fa5eed3..7eadc482b 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -50,10 +50,6 @@
 #include <unistd.h>
 #include <AvailabilityMacros.h>
 
-#ifdef XQUARTZ_SPARKLE
-#include <Sparkle/SUUpdater.h>
-#endif
-
 #include <Xplugin.h>
 
 // pbproxy/pbproxy.h
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index 5b38a1174..170bccc65 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.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