From 704f04b8ce57aa431ee8ace961f687ab64a87450 Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Mon, 10 Mar 2014 22:06:48 -0700 Subject: [PATCH] Fixed stupid errors compiling with Xcode 5.1 --- Frameworks/GME/gme/blargg_common.h | 2 +- Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Frameworks/GME/gme/blargg_common.h b/Frameworks/GME/gme/blargg_common.h index 05c74ffb2..8b0e34284 100644 --- a/Frameworks/GME/gme/blargg_common.h +++ b/Frameworks/GME/gme/blargg_common.h @@ -12,7 +12,7 @@ typedef const char* blargg_err_t; // 0 on success, otherwise error string // Success; no error -int const blargg_ok = 0; +blargg_err_t const blargg_ok = 0; // BLARGG_RESTRICT: equivalent to C99's restrict, where supported #if __GNUC__ >= 3 || _MSC_VER >= 1100 diff --git a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm index b533a862c..0cfa112bf 100644 --- a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm +++ b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm @@ -1645,8 +1645,7 @@ static int usf_info(void * context, const char * name, const char * value) NSString * decodedUrl = [[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - if ( psf_load( [decodedUrl UTF8String], &source_callbacks, 0, 0, 0, psf_info_meta, &info, 0 ) <= 0) - return NO; + psf_load( [decodedUrl UTF8String], &source_callbacks, 0, 0, 0, psf_info_meta, &info, 0 ); return info.info; }