diff options
| author | CeRiAl | 2011-07-12 01:26:05 +0200 |
|---|---|---|
| committer | CeRiAl | 2011-07-19 21:35:38 +0200 |
| commit | 32a2026676ae3b2c74adf528ec23e6d78013e2f7 (patch) | |
| tree | 7ecd01b56712136e22090505acad37617ef74e7a /backends | |
| parent | f60d6f7a9776253ad4716eb8a72fba18c91a7588 (diff) | |
| download | scummvm-rg350-32a2026676ae3b2c74adf528ec23e6d78013e2f7.tar.gz scummvm-rg350-32a2026676ae3b2c74adf528ec23e6d78013e2f7.tar.bz2 scummvm-rg350-32a2026676ae3b2c74adf528ec23e6d78013e2f7.zip | |
MACOSX/UPDATES: Fix compilation for Mac OSX 10.4+
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/updates/macosx/macosx-updates.mm | 5 |
1 files changed, 4 insertions, 1 deletions
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]; |