From 32a2026676ae3b2c74adf528ec23e6d78013e2f7 Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Tue, 12 Jul 2011 01:26:05 +0200
Subject: MACOSX/UPDATES: Fix compilation for Mac OSX 10.4+

---
 backends/updates/macosx/macosx-updates.mm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'backends')

diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm
index 8210b38400..e51bb7684d 100644
--- a/backends/updates/macosx/macosx-updates.mm
+++ b/backends/updates/macosx/macosx-updates.mm
@@ -20,6 +20,9 @@
  *
  */
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
 #include "backends/updates/sparkle-updates.h"
 
 #if defined(MACOSX) && defined(USE_SPARKLE)
@@ -43,7 +46,7 @@ MacOSXUpdateManager::MacOSXUpdateManager() {
 	[sparkleUpdater setFeedURL:[NSURL URLWithString:[NSString stringWithCString:getAppcastUrl().c_str()]]];
 
 	// Get current encoding
-	NSStringEncoding *stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)[NSString stringWithCString:(TransMan.getCurrentCharset()).c_str() encoding:NSASCIIStringEncoding]));
+	NSStringEncoding stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)[NSString stringWithCString:(TransMan.getCurrentCharset()).c_str() encoding:NSASCIIStringEncoding]));
 
 	// Add "Check for Updates..." menu item
 	NSMenuItem *updateMenuItem = [applicationMenu insertItemWithTitle:[NSString stringWithCString:_("Check for Updates...") encoding:stringEncoding] action:@selector(checkForUpdates:) keyEquivalent:@"" atIndex:1];
-- 
cgit v1.2.3